corrections

php/public/css/menu.css

@@ -39,10 +39,7 @@ a {
     padding: 10px;
     text-transform: uppercase;
     transition: 0.2s;
-<<<<<<< HEAD
     text-decoration: none;
-=======
->>>>>>> master
 }
 
 .navbar-container .nav-items .nav-link:after {
@@ -69,21 +66,14 @@ a {
     text-transform: uppercase;
     border-radius: 15px;
     border: #fff 2px solid;
-<<<<<<< HEAD
     text-decoration: none;
-=======
->>>>>>> master
 }
 
 .navbar-container .nav-items .login-register .button2{
     background: #00DBFF;
     color: #fff;
     border-radius: 15px;
-<<<<<<< HEAD
     text-decoration: none;
-
-=======
->>>>>>> master
 }
 
 .navbar-container .nav-items .login-register .button:hover {