From 81f9e59dcdd37db8b4f1d8158d791a7cbe836488 Mon Sep 17 00:00:00 2001
From: Mojca Lorber <mojca.lorber@biosistemika.com>
Date: Tue, 30 Aug 2016 12:14:15 +0200
Subject: [PATCH] fixes merge

---
 .../canvas/edit/modal/_move_module_group.html.erb     | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

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