Merge conflit corrected

app/models/event.rb

@@ -96,10 +96,7 @@ class Event < ActiveRecord::Base
   end
 
   def full_address
-<<<<<<< 32e574665f95c79a8ce3a538d8a7d03116872662
-=======
     # Temporary solution until OSM reverse geocoding can use the new regions
->>>>>>> Until OSM reverse geocoding understands the new French regions, we do not use regions' names...
     # [address, city, region.try(:name)].compact.join ', '
     [address, city].compact.join ', '
   end