Resolve conflicts for dispatcher.js and graph_component.vue

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

app/assets/javascripts/dispatcher.js

@@ -383,10 +383,7 @@ import initGroupAnalytics from './init_group_analytics';
           setupProjectEdit();
           // Initialize expandable settings panels
           initSettingsPanels();
-<<<<<<< HEAD
           new UsersSelect();
-=======
->>>>>>> ce-com/master
           break;
         case 'projects:imports:show':
           new ProjectImport();

app/assets/javascripts/pipelines/components/graph/graph_component.vue

 <script>
   import loadingIcon from '~/vue_shared/components/loading_icon.vue';
-<<<<<<< HEAD
-  import linkedPipelinesColumn from './linked_pipelines_column.vue';
-=======
   import '~/flash';
->>>>>>> ce-com/master
+  import linkedPipelinesColumn from './linked_pipelines_column.vue';
   import stageColumnComponent from './stage_column_component.vue';
 
   export default {