Resolve conflict in lib/api/entities.rb

Signed-off-by: Rémy Coutable <remy@rymai.me>

lib/api/entities.rb

@@ -894,25 +894,23 @@ module API
       expose :id
       expose :project, using: Entities::BasicProjectDetails
 
-<<<<<<< HEAD
-      # EE-specific
-      # Default filtering configuration
-      expose :name
-      expose :group
-      expose :milestone, using: Entities::Milestone, if: -> (board, _) { scoped_issue_available?(board) }
-      expose :assignee, using: Entities::UserBasic, if: -> (board, _) { scoped_issue_available?(board) }
-      expose :labels, using: Entities::LabelBasic, if: -> (board, _) { scoped_issue_available?(board) }
-      expose :weight, if: -> (board, _) { scoped_issue_available?(board) }
-
-=======
->>>>>>> upstream/master
       expose :lists, using: Entities::List do |board|
         board.lists.destroyable
       end
 
+      # EE-specific START
       def scoped_issue_available?(board)
         board.parent.feature_available?(:scoped_issue_board)
       end
+
+      # Default filtering configuration
+      expose :name
+      expose :group
+      expose :milestone, using: Entities::Milestone, if: -> (board, _) { scoped_issue_available?(board) }
+      expose :assignee, using: Entities::UserBasic, if: -> (board, _) { scoped_issue_available?(board) }
+      expose :labels, using: Entities::LabelBasic, if: -> (board, _) { scoped_issue_available?(board) }
+      expose :weight, if: -> (board, _) { scoped_issue_available?(board) }
+      # EE-specific END
     end
 
     class Compare < Grape::Entity