Fixed CACHE missing

cykod · Apr 12, 2010 · 6079570 · 6079570
1 parent 38e9cc5
commit 6079570
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/config/environment.rb b/config/environment.rb
@@ -185,12 +185,8 @@ def self.connection
 
 
 CACHE.servers =  [ 'localhost:11211' ]
-<<<<<<< HEAD:config/environment.rb
-ActionController::Base.session_options[:expires] = 10800
-=======
 
-ActionController::Base.session_options[:expires] = 5400 unless Rails.env == 'development'
->>>>>>> shop-updates:config/environment.rb
+ActionController::Base.session_options[:expires] = 10800 unless Rails.env == 'development'
 ActionController::Base.session_options[:cache] = CACHE