Merge branch 'master' into HEAD

[rails.git] / config / initializers / potlatch.rb

diff --git a/config/initializers/potlatch.rb b/config/initializers/potlatch.rb
deleted file mode 100644 (file)
index b98d60e..0000000
--- a/config/initializers/potlatch.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-# Load presets
-POTLATCH_PRESETS = Potlatch::Potlatch.get_presets()
-
-# Use SQL (faster) or Rails (more elegant) for common Potlatch reads
-# getway speedup is approximately x2, whichways approximately x7
-POTLATCH_USE_SQL = false