Resolve conflicts in `utils` and `utils_spec`

lib/gitlab/utils.rb

@@ -43,7 +43,10 @@ module Gitlab
       end
     end
 
-<<<<<<< HEAD
+    def random_string
+      Random.rand(Float::MAX.to_i).to_s(36)
+    end
+
     # EE below
     def try_megabytes_to_bytes(size)
       Integer(size).megabytes
@@ -66,10 +69,6 @@ module Gitlab
       end
 
       nil
-=======
-    def random_string
-      Random.rand(Float::MAX.to_i).to_s(36)
->>>>>>> ce-com/master
     end
   end
 end

spec/lib/gitlab/utils_spec.rb

@@ -17,9 +17,6 @@ describe Gitlab::Utils do
     end
   end
 
-  # EE
-  delegate :which, to: :described_class
-
   describe '.to_boolean' do
     it 'accepts booleans' do
       expect(to_boolean(true)).to be(true)
@@ -57,18 +54,20 @@ describe Gitlab::Utils do
     end
   end
 
-<<<<<<< HEAD
+  describe '.random_string' do
+    it 'generates a string' do
+      expect(random_string).to be_kind_of(String)
+    end
+  end
+
   # EE
+  delegate :which, to: :described_class
+
   describe '.which' do
     it 'finds the full path to an executable binary' do
       expect(File).to receive(:executable?).with('/bin/sh').and_return(true)
 
       expect(which('sh', 'PATH' => '/bin')).to eq('/bin/sh')
-=======
-  describe '.random_string' do
-    it 'generates a string' do
-      expect(random_string).to be_kind_of(String)
->>>>>>> ce-com/master
     end
   end
 end