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

2bd9f05b · Robert Speicher · 5f9d07b7 · 2bd9f05b
Commit 2bd9f05b authored Dec 06, 2018 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/views/projects/settings/repository/show.html.haml app/views/projects/settings/repository/show.html.haml +0 -3

No files found.
--- a/app/views/projects/settings/repository/show.html.haml
+++ b/app/views/projects/settings/repository/show.html.haml
@@ -21,8 +21,5 @@
 = render @deploy_keys
 = render "projects/deploy_tokens/index"
 = render "projects/cleanup/show"
-<<<<<<< HEAD

 = render 'shared/promotions/promote_repository_features'
-=======
->>>>>>> upstream/master