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/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -10,15 +10,11 @@
  <div id="header">
    <a href="/users">Users</a>
    <a href="/door_logs">Logs</a>
-<<<<<<< HEAD
-  </div>
-=======
    <%= link_to 'Profile', edit_user_registration_path if user_signed_in? %>
    <%= link_to 'Sign out', destroy_user_session_path, :method => :delete if user_signed_in? %>
  </div>
  <p class="notice"><%= notice %></p>
  <p class="alert"><%= alert %></p>
->>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1
 <%= yield %>

 </body>