Skip to content

G
gitlab-ce
Commit c4280a1a authored by Bob Van Landuyt's avatar Bob Van Landuyt
Browse files
Options

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

parent 381a636c
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/controllers/projects/issues_controller.rb
View file @ c4280a1a
...@@ -23,11 +23,8 @@ class Projects::IssuesController < Projects::ApplicationController ...@@ -23,11 +23,8 @@ class Projects::IssuesController < Projects::ApplicationController
# Allow create a new branch and empty WIP merge request from current issue # Allow create a new branch and empty WIP merge request from current issue
before_action :authorize_create_merge_request_from!, only: [:create_merge_request] before_action :authorize_create_merge_request_from!, only: [:create_merge_request]
<<<<<<< HEAD
prepend ::EE::Projects::IssuesController prepend ::EE::Projects::IssuesController
=======
>>>>>>> upstream/master
respond_to :html respond_to :html
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7