Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Change notify users table to list

  • Loading branch information...
commit b739dd99eb75e9a021c22d2d837b7f7a9b1b49d0 1 parent 3daab31
@sarken sarken authored
Showing with 4 additions and 0 deletions.
  1. +4 −0 app/views/admin/admin_users/notify.html.erb
View
4 app/views/admin/admin_users/notify.html.erb
@@ -50,4 +50,8 @@
<p class="submit actions"><%= submit_tag ts("Send Notification") %></p>
</fieldset>
<% end %>
+<<<<<<< HEAD
</div>
+=======
+</div>
+>>>>>>> Change notify users table to list
Please sign in to comment.
Something went wrong with that request. Please try again.