Resolve conflicts

80d1ead1 · Filipa Lacerda · 8db9888f · 80d1ead1
Commit 80d1ead1 authored Dec 21, 2016 by Filipa Lacerda
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

app/assets/javascripts/dispatcher.js.es6 app/assets/javascripts/dispatcher.js.es6 +1 -0

No files found.
--- a/app/assets/javascripts/dispatcher.js.es6
+++ b/app/assets/javascripts/dispatcher.js.es6
@@ -183,6 +183,7 @@
            container: '.js-pipeline-table',
          });
          break;
+        case 'projects:pipelines:builds':
        case 'projects:pipelines:show':
          const { controllerAction } = document.querySelector('.js-pipeline-container').dataset;