From af5104ca3195b0dcf78403d16dffa82054a3f242 Mon Sep 17 00:00:00 2001
From: echarp <manu@echarp.org>
Date: Mon, 18 Jan 2016 18:00:28 +0100
Subject: [PATCH] Merge conflit corrected
---
app/models/event.rb | 3 ---
1 file changed, 3 deletions(-)
diff --git a/app/models/event.rb b/app/models/event.rb
index 77da152af..32e7ebdfb 100644
--- 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
--
GitLab