Merge remote-tracking branch 'openstreetmap/pull/891'

[rails.git] / lib / country.rb

diff --git a/lib/country.rb b/lib/country.rb
index ea52efd77ccb59c91326f87a82ad4c12cf16b918..48a721a49cf48a3fddc9e1101a5beea0ec55fa90 100644 (file)
--- a/lib/country.rb
+++ b/lib/country.rb
@@ -13,14 +13,12 @@ class Country
     countries[code]
   end
 
-private
-
   def self.countries
-    @@countries ||= load_countries
+    @countries ||= load_countries
   end
 
   def self.load_countries
-    countries = Hash.new
+    countries = {}
     xml = REXML::Document.new(File.read("config/countries.xml"))
 
     xml.elements.each("geonames/country") do |ele|