Resolve qa/qa/page/project/settings/mirroring_repositories.rb

88c5db4e · Robert Speicher · d15d793b · 88c5db4e
Commit 88c5db4e authored Dec 06, 2018 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

qa/qa/page/project/settings/mirroring_repositories.rb qa/qa/page/project/settings/mirroring_repositories.rb +0 -3

No files found.
--- a/qa/qa/page/project/settings/mirroring_repositories.rb
+++ b/qa/qa/page/project/settings/mirroring_repositories.rb
@@ -5,11 +5,8 @@ module QA
    module Project
      module Settings
        class MirroringRepositories < Page::Base
-<<<<<<< HEAD
          prepend EE::Page::Project::Settings::MirroringRepositories

-=======
->>>>>>> upstream/master
          view 'app/views/projects/mirrors/_authentication_method.html.haml' do
            element :authentication_method
            element :password