scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-02 13:12:13 +08:00
Code Issues Projects Releases Packages Wiki Activity

fixes merge

Browse source
This commit is contained in:
Mojca Lorber 2016-08-30 12:14:15 +02:00
parent e8d187b5f6
commit 81f9e59dcd
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/views/canvas/edit/modal/_move_module_group.html.erb
View file

@ -23,15 +23,10 @@
<% end %>
</div>
<div class="modal-footer">
<<<<<<< HEAD
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<% if experiments.count > 1 %>
<button type="button" class="btn btn-primary" data-action="confirm"><%=t "experiments.canvas.edit.modal_move_module_group.confirm" %></button>
<% end %>
=======
<% if experiments.count > 1 %>
<button type="button" class="btn btn-primary" data-action="confirm"><%=t "experiments.canvas.edit.modal_move_module_group.confirm" %></button>
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
>>>>>>> ml_sci_395
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
<% end %>
</div>
</div>
</div>