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

Merge pull request #116 from mlorb/ml_sci_395

Browse source 
fixes merge
This commit is contained in:
mlorb 2016-08-30 12:20:30 +02:00 committed by GitHub
commit 6991ba54bb
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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