Fix conflicts

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

@@ -9,10 +9,7 @@ import deployBoard from 'ee/environments/components/deploy_board_component.vue';
 export default {
   components: {
     environmentItem,
-<<<<<<< HEAD
     deployBoard,
-=======
->>>>>>> upstream/master
   },
 
   props: {

app/assets/javascripts/notes/components/note_actions.vue

@@ -168,11 +168,7 @@ export default {
         href="#"
         title="Add reaction"
       >
-<<<<<<< HEAD
-        <gl-loading-icon :inline="true" />
-=======
         <gl-loading-icon inline/>
->>>>>>> upstream/master
         <span
           class="link-highlight award-control-icon-neutral"
           v-html="emojiSmiling">