[jb] Fix merge error
@@ -387,11 +387,7 @@ from desktop.views import _ko
<button class="btn btn-flat" style="padding-right: 2px" title="${_('Job browser')}" data-bind="hueLink: '/jobbrowser', click: function(){ huePubSub.publish('hide.jobs.panel'); }">
<span>${ _('Jobs') }</span>
</button>
-<<<<<<< HEAD
- <button class="btn btn-flat btn-toggle-jobs-panel" title="${_('Mini job browser')}" data-bind="toggle: jobsPanelVisible, style: {'paddingLeft': jobCount() > 0 ? '0': '4px'}">
-=======
- <button class="btn btn-flat btn-toggle-jobs-panel" title="${_('Min job browser')}" data-bind="click: function() { huePubSub.publish('toggle.jobs.panel'); }, style: {'paddingLeft': jobCount() > 0 ? '0': '4px'}">
->>>>>>> HUE-6438 [jb] Improve CSS for mini jobbrowser mode
+ <button class="btn btn-flat btn-toggle-jobs-panel" title="${_('Mini job browser')}" data-bind="click: function() { huePubSub.publish('toggle.jobs.panel'); }, style: {'paddingLeft': jobCount() > 0 ? '0': '4px'}">
<span class="jobs-badge" data-bind="visible: jobCount() > 0, text: jobCount"></span>
<i class="fa fa-sliders"></i>
</button>
