Fixed Conflicts in repo_file + repo_tab

app/assets/javascripts/ide/components/repo_file.vue

@@ -13,10 +13,7 @@
     components: {
       skeletonLoadingContainer,
       newDropdown,
-<<<<<<< HEAD
       fileStatusIcon,
-=======
->>>>>>> upstream/master
       fileIcon,
     },
     props: {
@@ -107,9 +104,9 @@
         >
         </file-icon>
         {{ file.name }}
-        <fileStatusIcon
+        <file-status-icon
           :file="file">
-        </fileStatusIcon>
+        </file-status-icon>
       </a>
       <new-dropdown
         v-if="isTree"

app/assets/javascripts/ide/components/repo_tab.vue

 <script>
 import { mapActions } from 'vuex';
-<<<<<<< HEAD
 import fileStatusIcon from './repo_file_status_icon.vue';
-=======
->>>>>>> upstream/master
 import fileIcon from '../../vue_shared/components/file_icon.vue';
 
 export default {
@@ -13,18 +10,10 @@ export default {
       required: true,
     },
   },
-<<<<<<< HEAD
-
   components: {
     fileStatusIcon,
     fileIcon,
   },
-
-=======
-  components: {
-    fileIcon,
-  },
->>>>>>> upstream/master
   computed: {
     closeLabel() {
       if (this.tab.changed || this.tab.tempFile) {