Resolve conflict in app/finders/issuable_finder.rb

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

Resolve conflict in app/finders/issuable_finder.rb
Signed-off-by: Rémy Coutable <remy@rymai.me>
0a4de96e · Rémy Coutable · c8899c55 · 0a4de96e
Commit 0a4de96e authored Sep 27, 2017 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/finders/issuable_finder.rb app/finders/issuable_finder.rb +0 -4

No files found.
--- a/app/finders/issuable_finder.rb
+++ b/app/finders/issuable_finder.rb
@@ -45,15 +45,11 @@ class IssuableFinder
  ].freeze
  ARRAY_PARAMS = { label_name: [], iids: [], assignee_username: [] }.freeze

-<<<<<<< HEAD
  EE_SCALAR_PARAMS = %i[
    weight
  ].freeze

  VALID_PARAMS = (SCALAR_PARAMS + [ARRAY_PARAMS] + EE_SCALAR_PARAMS).freeze
-=======
-  VALID_PARAMS = (SCALAR_PARAMS + [ARRAY_PARAMS]).freeze
->>>>>>> upstream/master

  attr_accessor :current_user, :params