Fix conflict in `app/controllers/projects/issues_controller.rb`

c4280a1a · Bob Van Landuyt · 381a636c · c4280a1a
Commit c4280a1a authored Apr 12, 2018 by Bob Van Landuyt
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/controllers/projects/issues_controller.rb app/controllers/projects/issues_controller.rb +0 -3

No files found.
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -23,11 +23,8 @@ class Projects::IssuesController < Projects::ApplicationController

  # Allow create a new branch and empty WIP merge request from current issue
  before_action :authorize_create_merge_request_from!, only: [:create_merge_request]
-<<<<<<< HEAD

  prepend ::EE::Projects::IssuesController
-=======
->>>>>>> upstream/master

  respond_to :html