Fix "Fix merge conflicts in usage ping"

lib/gitlab/usage_data.rb

@@ -64,7 +64,6 @@ module Gitlab
                                            author: User.support_bot,
                                            confidential: true).count
         }
-        }
       end
 
       def license_usage_data

spec/workers/gitlab_usage_ping_worker_spec.rb

@@ -6,13 +6,8 @@ describe GitlabUsagePingWorker do
   it "sends POST request" do
     stub_application_setting(usage_ping_enabled: true)
 
-<<<<<<< HEAD
-    stub_request(:post, "https://version.gitlab.com/usage_data")
-        .to_return(status: 200, body: '', headers: {})
-=======
     stub_request(:post, "https://version.gitlab.com/usage_data").
         to_return(status: 200, body: '', headers: {})
->>>>>>> ce/master
     expect(Gitlab::UsageData).to receive(:to_json).with({ force_refresh: true }).and_call_original
     expect(subject).to receive(:try_obtain_lease).and_return(true)