Resolve conflict in projects/issues_controller.rb

2019-02-05 09:10:21 -06:00 · 2019-02-05 09:10:21 -06:00 · de3bfd2848
parent 3cdaaf0996
commit de3bfd2848
1 changed files with 0 additions and 4 deletions
--- 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