Bad merge.

Author: dblock

lib/jammit.rb

@@ -72,8 +72,7 @@ def self.load_configuration(config_path, soft=false)
     conf = YAML.load(ERB.new(File.read(config_path)).result)
 
     # Optionally overwrite configuration based on the environment.
-    rails_env = defined?(Rails) ? Rails.env : ENV['RAILS_ENV']
-    conf.merge! conf.delete rails_env if conf.has_key? rails_env
+    conf.merge! conf.delete RAILS_ENV if conf.has_key? RAILS_ENV
 
     @config_path            = config_path
     @configuration          = symbolize_keys(conf)