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/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<p id="notice"><%= notice %></p>
-=======
->>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1

 <p>
  <b>Name:</b>
@@ -23,10 +19,6 @@
  <%= @user.card_permissions %>
 </p>

-<<<<<<< HEAD
-<%= link_to 'Upload to Door', upload_path(user) %>
-=======
 <%= link_to 'Upload to Door', upload_path(@user) %>
->>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1
 <%= link_to 'Edit', edit_user_path(@user) %> |
 <%= link_to 'Back', users_path %>
--- a/app/views/users/upload.html.erb
+++ b/app/views/users/upload.html.erb
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<p id="notice"><%= notice %></p>
-=======
->>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1

 <% if @upload_result %>
 <p>
--- a/app/views/users/upload_all.html.erb
+++ b/app/views/users/upload_all.html.erb
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-<p id="notice"><%= notice %></p>
-=======
->>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1

 <p>
 <b>Upload results:</b>