ChangeUi

src/global.scss

@@ -1340,19 +1340,12 @@ ngx-mat-datetime-content{
   .ldio-rpinwye8j0b div { box-sizing: content-box; }
 
   .transparent-modal {
-<<<<<<< HEAD
     --background: #f1eaeae7;
         --margin: 0;
         --padding: 0;
 
     ion-content {
         --background:#f1f0ebe7;
-=======
-    --background: #000000;
-
-    ion-content {
-        --background:#2e2121;
->>>>>>> 6a912b740d97159664c5fe5dff07ac378b028771
       
     }
 }