resolve conflicts on spec/lib/gitlab/usage_data_spec.rb

spec/lib/gitlab/usage_data_spec.rb

@@ -156,14 +156,10 @@ describe Gitlab::UsageData do
     subject { described_class.license_usage_data }
 
     it "gathers license data" do
-<<<<<<< HEAD
       license = ::License.current
 
       expect(subject[:uuid]).to eq(Gitlab::CurrentSettings.uuid)
       expect(subject[:license_md5]).to eq(Digest::MD5.hexdigest(license.data))
-=======
-      expect(subject[:uuid]).to eq(Gitlab::CurrentSettings.uuid)
->>>>>>> upstream/master
       expect(subject[:version]).to eq(Gitlab::VERSION)
       expect(subject[:licensee]).to eq(license.licensee)
       expect(subject[:active_user_count]).to eq(User.active.count)