Will Bradley
d3b8ad7222
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
17 lines
267 B
Plaintext
17 lines
267 B
Plaintext
<<<<<<< HEAD
|
|
<p id="notice"><%= notice %></p>
|
|
=======
|
|
>>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1
|
|
|
|
<p>
|
|
<b>Upload results:</b>
|
|
<ul>
|
|
<% @upload_result.each do |r| %>
|
|
<li><%= r[0] %> <%= r[1] %></li>
|
|
<% end %>
|
|
</ul>
|
|
</p>
|
|
|
|
|
|
<%= link_to 'Back', users_path %>
|