diff options
| author | Brett Walker <bwalker@gitlab.com> | 2019-02-05 09:10:21 -0600 |
|---|---|---|
| committer | Brett Walker <bwalker@gitlab.com> | 2019-02-05 09:10:21 -0600 |
| commit | de3bfd284891cbfbb6260d43fcae4bf7ee13b3e9 (patch) | |
| tree | 00c10262c079699568a60b8fd9806ee5e7df0cc0 | |
| parent | 3cdaaf0996595f4f44727d070f679efe60fe3e6d (diff) | |
| download | gitlab-ce-de3bfd284891cbfbb6260d43fcae4bf7ee13b3e9.tar.gz | |
Resolve conflict in projects/issues_controller.rb
| -rw-r--r-- | app/controllers/projects/issues_controller.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index f9604302e28..f9a80aa3cfb 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -246,11 +246,7 @@ class Projects::IssuesController < Projects::ApplicationController task_num lock_version discussion_locked -<<<<<<< HEAD ] + [{ label_ids: [], assignee_ids: [], update_task: [:index, :checked, :line_number, :line_source] }] -======= - ] + [{ label_ids: [], assignee_ids: [] }] ->>>>>>> dev/master end def store_uri |