conflits

css

src/app/pages/page-account/page-account.component.html

@@ -18,4 +18,4 @@
             <input type="RoleList" class="form-control" id="inputRoleList" formControlName="RoleList" readonly="readonly">
         </div>
     </form>
-</div>
+</div>

src/app/pages/page-denied/page-denied.component.html

@@ -1,3 +1,7 @@
+<<<<<<< HEAD
+<div class="container mb-5">
+=======
 <div class="container mb-5 mt-5">
+>>>>>>> main
 <img src="assets/you-shall-not-pass.gif"/>
-</div>
+</div>

src/app/pages/resto-page/resto-page.component.scss

@@ -9,12 +9,12 @@
 }
 
 .titre{
-    
+
     display: flex;
     justify-content: flex-start;
     margin: 2.5em 0 0.5em 8.2em;
     color: #CE0000;
-    
+
 }
 
 

src/environments/environment.ts

@@ -4,7 +4,7 @@
 
 export const environment = {
   production: false,
-  apiUrl: "http://localhost:8081",
+  apiUrl: "http://localhost:8080",
   tokenKey: "TOKEN-SIMPLEAT"
 };