Merge remote-tracking branch 'upstream/pull/1809'

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index 66428c13cdca3ef28935f9fe763d455309f74e92..71e12534ffe57c348d4802d81aeb40f9a4b31cbf 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -514,9 +514,9 @@ module OSM
       country = "GB" if country == "UK"
     end
 
-    return country
+    country
   rescue StandardError
-    return nil
+    nil
   end
 
   def self.ip_location(ip_address)