Commit 28850bc7 authored by Rémy Coutable's avatar Rémy Coutable 🏔

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

Signed-off-by: Rémy Coutable's avatarRémy Coutable <remy@rymai.me>
parent 4d9da5af
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment