will/Open-Source-Access-Control-Web-Interface
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed merge conflict with mailer url, need to remove this from git as well

Browse Source
This commit is contained in:
Will Bradley 2012-09-15 21:44:06 -07:00
parent ed8d284619
commit f3443a3a82
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/environments/production.rb
View File

@ -64,9 +64,6 @@ Dooraccess::Application.configure do
# Log the query plan for queries taking more than this (works # Log the query plan for queries taking more than this (works
# with SQLite, MySQL, and PostgreSQL) # with SQLite, MySQL, and PostgreSQL)
# config.active_record.auto_explain_threshold_in_seconds = 0.5 # config.active_record.auto_explain_threshold_in_seconds = 0.5
<<<<<<< HEAD
=======
config.action_mailer.default_url_options = { :host => 'members.heatsynclabs.org' } config.action_mailer.default_url_options = { :host => 'members.heatsynclabs.org' }
>>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1
end end

0
log/.gitkeep Normal file → Executable file
View File