Resolving conflict entities.rb

1156c895 · Francisco Javier López · d319133c · 1156c895
Commit 1156c895 authored Mar 06, 2018 by Francisco Javier López
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

lib/api/entities.rb lib/api/entities.rb +0 -3

No files found.
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -1255,7 +1255,6 @@ module API
        badge.type == 'ProjectBadge' ? 'project' : 'group'
      end
    end
-<<<<<<< HEAD
    def self.prepend_entity(klass, with: nil)
      if with.nil?
@@ -1265,8 +1264,6 @@ module API
      klass.descendants.each { |descendant| descendant.prepend(with) }
      klass.prepend(with)
    end
-=======
->>>>>>> upstream/master
  end
 end