Merged more conflicts

2012-09-15 17:44:30 -07:00
parent d3b8ad7222
commit 0bc5858101
15 changed files with 1 additions and 115 deletions
--- a/app/views/door_logs/download.html.erb
+++ b/app/views/door_logs/download.html.erb
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<p id="notice"><%= notice %></p>
-=======
->>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1

 <p>
  <b>Download results:</b>
--- a/app/views/door_logs/show.html.erb
+++ b/app/views/door_logs/show.html.erb
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<p id="notice"><%= notice %></p>
-=======
->>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1

 <p>
  <b>Key:</b>