Resolve conflict in lib/gitlab/metrics/transaction.rb

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

lib/gitlab/metrics/transaction.rb

@@ -70,7 +70,6 @@ module Gitlab
       def add_event(event_name, tags = {})
         self.class.metric_event_counter(event_name, tags).increment(tags.merge(labels))
         @metrics << Metric.new(EVENT_SERIES, { count: 1 }, tags.merge(event: event_name), :event)
-<<<<<<< HEAD
       end
 
       #
@@ -80,8 +79,6 @@ module Gitlab
                                { count: 1 }.merge(values),
                                { event: event_name }.merge(tags),
                                :event)
-=======
->>>>>>> upstream/master
       end
 
       # Returns a MethodCall object for the given name.

spec/lib/gitlab/metrics/web_transaction_spec.rb

@@ -155,7 +155,6 @@ describe Gitlab::Metrics::WebTransaction do
     end
   end
 
-<<<<<<< HEAD:spec/lib/gitlab/metrics/web_transaction_spec.rb
   describe '#add_event_with_values' do
     it 'adds a metric' do
       transaction.add_event_with_values(:meow, {})
@@ -180,8 +179,6 @@ describe Gitlab::Metrics::WebTransaction do
     end
   end
 
-=======
->>>>>>> upstream/master:spec/lib/gitlab/metrics/web_transaction_spec.rb
   describe '#labels' do
     context 'when request goes to Grape endpoint' do
       before do