fixes merge again

This commit is contained in:
Mojca Lorber 2016-08-30 12:54:08 +02:00
parent 6991ba54bb
commit 43c3a0bb81

View file

@ -25,8 +25,8 @@
<div class="modal-footer">
<% 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>
<% end %>
<button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
</div>
</div>
</div>