Studium
/
Softwareprojektmanagement
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge missed one

This commit is contained in:
Johannes Theiner 2019-05-28 16:42:32 +02:00
parent f15ea28af3
commit 614f4b29ba
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/webapp/index.jsp
View File

@ -63,7 +63,6 @@
</div> </div>
</div> </div>
<<<<<<< HEAD
<!--Gruppenübersicht--> <!--Gruppenübersicht-->
<div class="col s12 m12"> <div class="col s12 m12">
<div id="group_overview" class="card white"> <div id="group_overview" class="card white">
@ -75,7 +74,7 @@
<table id="cluster_table"> <table id="cluster_table">
</table> </table>
</div> </div>
</div>
<!--Warenkorbanlyse--> <!--Warenkorbanlyse-->
<div id="shopping_card_analysis" class="col s12 m12"> <div id="shopping_card_analysis" class="col s12 m12">
@ -86,14 +85,10 @@
<div class="card-content"> <div class="card-content">
<table id="shopping_cart_table"> <table id="shopping_cart_table">
</table> </table>
>>>>>>> origin/SPM-24
</div> </div>
</div> </div>
</div> </div>
</div>
<!--Marketing-Cards--> <!--Marketing-Cards-->
<div id="marketing" class="row container"> <div id="marketing" class="row container">
<div class="row"> <div class="row">