Revert broken attempt at potlatch_010 merge.

[rails.git] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index e6af619eb82b03aaaf8400db39ea951dbba227b6..495f94d80a63f08b22f639bdcbaaace8c6d946e0 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -74,3 +74,8 @@ Rails::Initializer.run do |config|
   # Make Active Record use UTC-base instead of local time
   # config.active_record.default_timezone = :utc
 end
+
+# This has to be after the above block for some reason (doesnt pull in /lib/osm.rb?)
+POTLATCH_PRESETS = Potlatch::Potlatch.get_presets()
+
+