Remove event collector merge cruft

francoishill · May 5, 2015 · 276be02 · 276be02
1 parent ff8e92d
commit 276be02
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/r2/example.ini b/r2/example.ini
@@ -757,13 +757,8 @@ captcha_exempt_comment_karma = 1
 create_sr_account_age_days = 0
 create_sr_link_karma = 0
 create_sr_comment_karma = 0
-<<<<<<< HEAD
-=======
-# class name to style goldvertisement for special events
-goldvertisement_class =
 # Sample rate for event-collector processing
 events_collector_sample_rate = 0.0
->>>>>>> ad5804b... Events: Add an event collector
 
 #### Features
 # Availability for the "force HTTPS" option