Resolve conflict in spec/lib/gitlab/utils_spec.rb

Signed-off-by: Rémy Coutable <remy@rymai.me>

spec/lib/gitlab/utils_spec.rb

 require 'spec_helper'
 
 describe Gitlab::Utils do
-<<<<<<< HEAD
-  delegate :to_boolean, :boolean_to_yes_no, :slugify, :random_string, :which, :ensure_array_from_string, :bytes_to_megabytes, to: :described_class
-=======
   delegate :to_boolean, :boolean_to_yes_no, :slugify, :random_string, :which, :ensure_array_from_string,
    :bytes_to_megabytes, to: :described_class
->>>>>>> upstream/master
 
   describe '.slugify' do
     {