Resolve conflicts in `app/views/admin/projects/show.html.haml`

7e1943e2 · Bob Van Landuyt · e6fd6de1 · 7e1943e2
Commit 7e1943e2 authored Apr 12, 2018 by Bob Van Landuyt
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/app/views/admin/projects/show.html.haml
+++ b/app/views/admin/projects/show.html.haml
@@ -102,11 +102,8 @@
          %li
            %span.light archived:
            %strong project is read-only
-<<<<<<< HEAD

        = render "shared_runner_status", project: @project
-=======
->>>>>>> upstream/master

        %li
          %span.light access: