From 43c3a0bb81cb68a4041dc1b03730f855daa4241c Mon Sep 17 00:00:00 2001
From: Mojca Lorber <mojca.lorber@biosistemika.com>
Date: Tue, 30 Aug 2016 12:54:08 +0200
Subject: [PATCH] fixes merge again

---
 app/views/canvas/edit/modal/_move_module_group.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/canvas/edit/modal/_move_module_group.html.erb b/app/views/canvas/edit/modal/_move_module_group.html.erb
index b36efc9bf..d950cc3ee 100644
--- a/app/views/canvas/edit/modal/_move_module_group.html.erb
+++ b/app/views/canvas/edit/modal/_move_module_group.html.erb
@@ -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>