Merge conflit corrected

2016-01-18 18:00:28 +01:00 · 2016-01-18 18:00:28 +01:00 · af5104ca31
parent 7b0d142693
commit af5104ca31
1 changed files with 0 additions and 3 deletions
--- a/app/models/event.rb
+++ b/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