mybutton fix

2024-06-27 23:07:29 +03:00 · 2024-06-27 23:07:29 +03:00 · d25e54f73f
commit d25e54f73f
parent 58b6d1387d
1 changed files with 1 additions and 5 deletions
--- a/src/assets/styles/components/myButton.module.scss
+++ b/src/assets/styles/components/myButton.module.scss
@ -30,7 +30,6 @@
    &:hover {
      border: 1px solid rgba(0, 0, 0, 0.3);
    }
-<<<<<<< HEAD
    &__green {
        color: white;
        background-color: rgb(150, 209, 158);
@ -54,7 +53,4 @@
        }
    }
  }
-=======
 }
-}
->>>>>>> 750b571374c05b915d136af481fe93bf966bac39