agenda-libre/agenda-libre-ruby
agenda-libre/agenda-libre-ruby
2
1
Fork 0
Code Issues Pull Requests Releases Activity

Merge conflit corrected

Browse Source
This commit is contained in:
echarp 2016-01-18 18:00:28 +01:00
parent 7b0d142693
commit af5104ca31
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/event.rb
View File

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