conflits

css

package-lock.json

@@ -2502,16 +2502,6 @@
         "read-package-json-fast": "^2.0.1"
       }
     },
-    "node_modules/@popperjs/core": {
-      "version": "2.11.8",
-      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
-      "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==",
-      "peer": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/popperjs"
-      }
-    },
     "node_modules/@schematics/angular": {
       "version": "13.0.4",
       "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-13.0.4.tgz",
@@ -14321,12 +14311,6 @@
         "read-package-json-fast": "^2.0.1"
       }
     },
-    "@popperjs/core": {
-      "version": "2.11.8",
-      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
-      "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==",
-      "peer": true
-    },
     "@schematics/angular": {
       "version": "13.0.4",
       "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-13.0.4.tgz",

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"
 };