Reolve conflicts in app/controllers/projects/settings/repository_controller.rb

a2003f2f · Stan Hu · ab24e114 · a2003f2f
Commit a2003f2f authored May 07, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/controllers/projects/settings/repository_controller.rb app/controllers/projects/settings/repository_controller.rb +0 -3

No files found.
--- a/app/controllers/projects/settings/repository_controller.rb
+++ b/app/controllers/projects/settings/repository_controller.rb
@@ -5,11 +5,8 @@ module Projects
      before_action :authorize_admin_project!
      before_action :remote_mirror, only: [:show]
-<<<<<<< HEAD
      prepend ::EE::Projects::Settings::RepositoryController
-=======
->>>>>>> upstream/master
      def show
        render_show