Resolve conflicts in qa

39879c7b · Jarka Kadlecová · 165833d3 · 39879c7b
Commit 39879c7b authored Feb 14, 2018 by Jarka Kadlecová
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

qa/qa.rb qa/qa.rb +0 -6

No files found.
--- a/qa/qa.rb
+++ b/qa/qa.rb
@@ -117,14 +117,8 @@ module QA
        autoload :Show, 'qa/page/project/pipeline/show'
      end

-<<<<<<< HEAD
-      module Pipeline
-        autoload :Index, 'qa/page/project/pipeline/index'
-        autoload :Show, 'qa/page/project/pipeline/show'
-=======
      module Job
        autoload :Show, 'qa/page/project/job/show'
->>>>>>> upstream/master
      end

      module Settings