Resolve conflict in utils.rb

97301bd9 · Michael Kozono · 77ea749c · 97301bd9
Commit 97301bd9 authored Dec 12, 2017 by Michael Kozono
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

lib/gitlab/utils.rb lib/gitlab/utils.rb +0 -3

No files found.
--- a/lib/gitlab/utils.rb
+++ b/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