[ci skip] Fix conflict for app/assets/javascripts/ide/components/ide_project_branches_tree.vue

abdf5f38 · Filipa Lacerda · 9468c9fc · abdf5f38
Commit abdf5f38 authored Jan 11, 2018 by Filipa Lacerda
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/assets/javascripts/ide/components/ide_project_branches_tree.vue .../javascripts/ide/components/ide_project_branches_tree.vue +0 -4

No files found.
--- a/app/assets/javascripts/ide/components/ide_project_branches_tree.vue
+++ b/app/assets/javascripts/ide/components/ide_project_branches_tree.vue
@@ -41,11 +41,7 @@ export default {
      </div>
    </div>
    <div>
-<<<<<<< HEAD
-      <repo-tree :tree-id="branch.treeId"/>
-=======
      <repo-tree :tree-id="branch.treeId" />
->>>>>>> upstream/master
    </div>
  </div>
 </template>