Resolve conflict in app/assets/javascripts/repo/components/repo_tab.vue

Signed-off-by: Rémy Coutable <remy@rymai.me>

Resolve conflict in app/assets/javascripts/repo/components/repo_tab.vue
Signed-off-by: Rémy Coutable <remy@rymai.me>
848890b0 · Rémy Coutable · eb6206b6 · 848890b0
Commit 848890b0 authored Nov 30, 2017 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 8 deletions

app/assets/javascripts/repo/components/repo_tab.vue app/assets/javascripts/repo/components/repo_tab.vue +0 -8

No files found.
--- a/app/assets/javascripts/repo/components/repo_tab.vue
+++ b/app/assets/javascripts/repo/components/repo_tab.vue
@@ -66,18 +66,10 @@ export default {
      :class="{active : tab.active }"
      :title="tab.url"
    >
-<<<<<<< HEAD
-      {{tab.name}}
-      <fileStatusIcon
-        :file="tab">
-      </fileStatusIcon>
-    </a>
-=======
      {{ tab.name }}
      <file-status-icon
        :file="tab"
      />
    </div>
->>>>>>> origin/master
  </li>
 </template>