Resolve conflicts in app/views/projects/settings/repository/show.html.haml

f4359dfc · Stan Hu · 79f4d514 · f4359dfc
Commit f4359dfc authored Apr 07, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

app/views/projects/settings/repository/show.html.haml app/views/projects/settings/repository/show.html.haml +1 -4

No files found.
--- a/app/views/projects/settings/repository/show.html.haml
+++ b/app/views/projects/settings/repository/show.html.haml
@@ -18,9 +18,6 @@
  = render "projects/protected_tags/index"

 = render @deploy_keys
-<<<<<<< HEAD
+= render "projects/deploy_tokens/index"

 = render 'shared/promotions/promote_repository_features'
-=======
-= render "projects/deploy_tokens/index"
->>>>>>> upstream/master