From f3443a3a82a87af1db04957248596ffe83970dc8 Mon Sep 17 00:00:00 2001
From: Will Bradley <bradley.will@gmail.com>
Date: Sat, 15 Sep 2012 21:44:06 -0700
Subject: [PATCH] Fixed merge conflict with mailer url, need to remove this
 from git as well

---
 config/environments/production.rb | 3 ---
 log/.gitkeep                      | 0
 2 files changed, 3 deletions(-)
 mode change 100644 => 100755 log/.gitkeep

diff --git a/config/environments/production.rb b/config/environments/production.rb
index 74d1c0e..97757dd 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -64,9 +64,6 @@ Dooraccess::Application.configure do
   # Log the query plan for queries taking more than this (works
   # with SQLite, MySQL, and PostgreSQL)
   # config.active_record.auto_explain_threshold_in_seconds = 0.5
-<<<<<<< HEAD
-=======
   
   config.action_mailer.default_url_options = { :host => 'members.heatsynclabs.org' }
->>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1
 end
diff --git a/log/.gitkeep b/log/.gitkeep
old mode 100644
new mode 100755