Open-Source-Access-Control-.../app/views/users/show.html.erb

<<<<<<< HEAD
<p id="notice"><%= notice %></p>
=======
>>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1

<p>
  <b>Name:</b>
  <%= @user.name %>
</p>

<p>
  <b>Card DB ID:</b>
  <%= @user.card_id %>
</p>

<p>
  <b>Card Number:</b>
  <%= @user.card_number %>
</p>

<p>
  <b>Card Permissions:</b>
  <%= @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 %>
Merge branch 'master' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface Conflicts: .gitignore Gemfile Gemfile.lock app/controllers/door_logs_controller.rb app/controllers/users_controller.rb app/models/user.rb app/views/door_logs/download.html.erb app/views/door_logs/show.html.erb app/views/layouts/application.html.erb app/views/users/show.html.erb app/views/users/upload.html.erb app/views/users/upload_all.html.erb config/environments/development.rb config/environments/production.rb config/routes.rb db/schema.rb 2012-09-16 00:34:55 +00:00			`<<<<<<< HEAD`
Got uploading working 2012-08-25 04:14:51 +00:00			`<p id="notice"><%= notice %></p>`
Merge branch 'master' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface Conflicts: .gitignore Gemfile Gemfile.lock app/controllers/door_logs_controller.rb app/controllers/users_controller.rb app/models/user.rb app/views/door_logs/download.html.erb app/views/door_logs/show.html.erb app/views/layouts/application.html.erb app/views/users/show.html.erb app/views/users/upload.html.erb app/views/users/upload_all.html.erb config/environments/development.rb config/environments/production.rb config/routes.rb db/schema.rb 2012-09-16 00:34:55 +00:00			`=======`
			`>>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1`
Got uploading working 2012-08-25 04:14:51 +00:00
			`<p>`
			`<b>Name:</b>`
			`<%= @user.name %>`
			`</p>`

			`<p>`
			`<b>Card DB ID:</b>`
			`<%= @user.card_id %>`
			`</p>`

			`<p>`
			`<b>Card Number:</b>`
			`<%= @user.card_number %>`
			`</p>`

			`<p>`
			`<b>Card Permissions:</b>`
			`<%= @user.card_permissions %>`
			`</p>`

Merge branch 'master' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface Conflicts: .gitignore Gemfile Gemfile.lock app/controllers/door_logs_controller.rb app/controllers/users_controller.rb app/models/user.rb app/views/door_logs/download.html.erb app/views/door_logs/show.html.erb app/views/layouts/application.html.erb app/views/users/show.html.erb app/views/users/upload.html.erb app/views/users/upload_all.html.erb config/environments/development.rb config/environments/production.rb config/routes.rb db/schema.rb 2012-09-16 00:34:55 +00:00			`<<<<<<< HEAD`
Got door logs working 2012-08-25 06:28:00 +00:00			`<%= link_to 'Upload to Door', upload_path(user) %>`
Merge branch 'master' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface Conflicts: .gitignore Gemfile Gemfile.lock app/controllers/door_logs_controller.rb app/controllers/users_controller.rb app/models/user.rb app/views/door_logs/download.html.erb app/views/door_logs/show.html.erb app/views/layouts/application.html.erb app/views/users/show.html.erb app/views/users/upload.html.erb app/views/users/upload_all.html.erb config/environments/development.rb config/environments/production.rb config/routes.rb db/schema.rb 2012-09-16 00:34:55 +00:00			`=======`
Finished adding user profile stuff 2012-09-04 04:56:37 +00:00			`<%= link_to 'Upload to Door', upload_path(@user) %>`
Merge branch 'master' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface Conflicts: .gitignore Gemfile Gemfile.lock app/controllers/door_logs_controller.rb app/controllers/users_controller.rb app/models/user.rb app/views/door_logs/download.html.erb app/views/door_logs/show.html.erb app/views/layouts/application.html.erb app/views/users/show.html.erb app/views/users/upload.html.erb app/views/users/upload_all.html.erb config/environments/development.rb config/environments/production.rb config/routes.rb db/schema.rb 2012-09-16 00:34:55 +00:00			`>>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1`
Got uploading working 2012-08-25 04:14:51 +00:00			`<%= link_to 'Edit', edit_user_path(@user) %> \|`
			`<%= link_to 'Back', users_path %>`