Commit de3bfd28 authored by Brett Walker's avatar Brett Walker

Resolve conflict in projects/issues_controller.rb

parent 3cdaaf09
......@@ -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
......
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