Minor bug fix for production environment initializer

ifunam · Dec 1, 2012 · fad6d9c · fad6d9c
1 parent c29c319
commit fad6d9c
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -56,11 +56,7 @@
   # config.assets.precompile += %w( search.js )
   config.assets.precompile += %w( screen.css print.css ie.css devise.css devise.js user_resources.css
                                   user_resources.js publications.css publications.js academic.css
-<<<<<<< HEAD
-                                  academic.js web_site.css web_site.js home_page.css home_pages.js)
-=======
                                   academic.js web_site.css web_site.js home_page.css admin.css)
->>>>>>> master
 
   # Disable delivery errors, bad email addresses will be ignored
   # config.action_mailer.raise_delivery_errors = false