Resolve qa/qa/page/project/show.rb

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

Resolve qa/qa/page/project/show.rb
Signed-off-by: Rémy Coutable <remy@rymai.me>
28850bc7 · Rémy Coutable · 4d9da5af · 28850bc7
Commit 28850bc7 authored Sep 05, 2018 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

qa/qa/page/project/show.rb qa/qa/page/project/show.rb +0 -3

No files found.
--- a/qa/qa/page/project/show.rb
+++ b/qa/qa/page/project/show.rb
@@ -2,11 +2,8 @@ module QA
  module Page
    module Project
      class Show < Page::Base
-<<<<<<< HEAD
        prepend QA::EE::Page::Project::Show

-=======
->>>>>>> upstream/master
        include Page::Component::ClonePanel

        view 'app/views/projects/_last_push.html.haml' do