From de3bfd284891cbfbb6260d43fcae4bf7ee13b3e9 Mon Sep 17 00:00:00 2001 From: Brett Walker Date: Tue, 5 Feb 2019 09:10:21 -0600 Subject: Resolve conflict in projects/issues_controller.rb --- app/controllers/projects/issues_controller.rb | 4 ---- 1 file changed, 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 -- cgit v1.2.1