From 614f4b29ba1553cd6b6bf59ba038de95f83e51a1 Mon Sep 17 00:00:00 2001
From: joethei <j.theiner@live.de>
Date: Tue, 28 May 2019 16:42:32 +0200
Subject: [PATCH] merge missed one

---
 src/main/webapp/index.jsp | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp
index 2f081a6..25064ff 100644
--- a/src/main/webapp/index.jsp
+++ b/src/main/webapp/index.jsp
@@ -63,7 +63,6 @@
         </div>
     </div>
 
-    <<<<<<< HEAD
     <!--Gruppenübersicht-->
     <div class="col s12 m12">
         <div id="group_overview" class="card white">
@@ -75,23 +74,19 @@
                     <table id="cluster_table">
                     </table>
                 </div>
+            </div>
 
-
-                <!--Warenkorbanlyse-->
-                <div id="shopping_card_analysis" class="col s12 m12">
-                    <div class="card white">
-                        <div class="center">
-                            <span class="card-title center">Warenkorbanalyse</span>
-                        </div>
-                        <div class="card-content">
-                            <table id="shopping_cart_table">
-                            </table>
-                            >>>>>>> origin/SPM-24
-                        </div>
+            <!--Warenkorbanlyse-->
+            <div id="shopping_card_analysis" class="col s12 m12">
+                <div class="card white">
+                    <div class="center">
+                        <span class="card-title center">Warenkorbanalyse</span>
+                    </div>
+                    <div class="card-content">
+                        <table id="shopping_cart_table">
+                        </table>
                     </div>
                 </div>
-
-
             </div>
 
             <!--Marketing-Cards-->