Resolving conflict entities.rb

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