conflits

css

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>

src/environments/environment.ts

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