Resolve conflict in app/controllers/boards/issues_controller.rb

8eea4504 · Micaël Bergeron · 313f7903 · 8eea4504
Commit 8eea4504 authored Sep 18, 2017 by Micaël Bergeron
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/controllers/boards/issues_controller.rb app/controllers/boards/issues_controller.rb +0 -4

No files found.
--- a/app/controllers/boards/issues_controller.rb
+++ b/app/controllers/boards/issues_controller.rb
@@ -12,11 +12,7 @@ module Boards
    def index
      issues = Boards::Issues::ListService.new(board_parent, current_user, filter_params).execute
      issues = issues.page(params[:page]).per(params[:per] || 20)
-<<<<<<< HEAD
      make_sure_position_is_set(issues) unless Gitlab::Geo.secondary?
-=======
-      make_sure_position_is_set(issues)
->>>>>>> ce-com/master
      issues = issues.preload(:project,
                              :milestone,
                              :assignees,