[FIX] removes conflict

zakarm · Apr 26, 2024 · 1936f2c · 1936f2c
1 parent 3eb6238
commit 1936f2c
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/app/front-end/src/app/dashboard/style.module.css b/app/front-end/src/app/dashboard/style.module.css
@@ -23,10 +23,7 @@
 
 .card {
     border-radius: 15px;
-<<<<<<< HEAD
-=======
     height: 100%;
->>>>>>> 8f93d643e161cb735f2123c0b7c055a373c1dabc
 }
 
 .buttom_cards {