Resolve conflict in utils.rb

lib/gitlab/utils.rb

@@ -63,7 +63,6 @@ module Gitlab
 
       nil
     end
-<<<<<<< HEAD
 
     # EE below
     def try_megabytes_to_bytes(size)
@@ -71,7 +70,5 @@ module Gitlab
     rescue ArgumentError
       size
     end
-=======
->>>>>>> upstream/master
   end
 end