Resolve conflicts for:

- app/assets/javascripts/environments/components/environments_table.vue
- app/assets/javascripts/vue_shared/components/ci_badge_link.vue
- spec/javascripts/gl_dropdown_spec.js

app/assets/javascripts/environments/components/environments_table.vue

@@ -3,20 +3,14 @@
  * Render environments table.
  */
 import EnvironmentTableRowComponent from './environment_item.vue';
-<<<<<<< HEAD
 import DeployBoard from './deploy_board_component.vue';
-=======
 import loadingIcon from '../../vue_shared/components/loading_icon.vue';
->>>>>>> upstream/master
 
 export default {
   components: {
     'environment-item': EnvironmentTableRowComponent,
-<<<<<<< HEAD
     DeployBoard,
-=======
     loadingIcon,
->>>>>>> upstream/master
   },
 
   props: {

app/assets/javascripts/vue_shared/components/ci_badge_link.vue

@@ -13,11 +13,7 @@ import ciIcon from './ci_icon.vue';
  *   text:"running" // text rendered
  * }
  *
-<<<<<<< HEAD
- * Shared between:
-=======
  * Used in:
->>>>>>> upstream/master
  * - Pipelines table - first column
  * - Jobs table - first column
  * - Pipeline show view - header

spec/javascripts/gl_dropdown_spec.js

@@ -52,14 +52,10 @@ require('~/lib/utils/url_utility');
           fields: ['name']
         },
         text: project => (project.name_with_namespace || project.name),
-<<<<<<< HEAD
         id: project => project.id
-      });
-=======
-        id: project => project.id,
       }, extraOpts);
+
       this.dropdownButtonElement = $('#js-project-dropdown', this.dropdownContainerElement).glDropdown(options);
->>>>>>> upstream/master
     }
 
     beforeEach(() => {