resolved repo components

[ci skip]

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

@@ -54,14 +54,10 @@
   <tr
     class="file"
     @click.prevent="clickedTreeRow(file)">
-<<<<<<< HEAD
-    <td :colspan="submoduleColSpan">
-=======
     <td
       class="multi-file-table-col-name"
       :colspan="submoduleColSpan"
     >
->>>>>>> upstream/master
       <i
         class="fa fa-fw file-icon"
         :class="fileIcon"

app/assets/javascripts/repo/components/repo_loading_file.vue

@@ -19,11 +19,7 @@
     class="loading-file"
     aria-label="Loading files"
   >
-<<<<<<< HEAD
-    <td>
-=======
     <td class="multi-file-table-col-name">
->>>>>>> upstream/master
       <skeleton-loading-container
         :small="true"
       />