conflits

page-account
environnement.ts
2022-03-13 14:25:08 +01:00 · 2022-03-11 15:51:42 +01:00 · 2022-03-11 15:38:59 +01:00 · 2022-03-11 15:36:11 +01:00 · 2022-03-11 15:34:20 +01:00
4 changed files with 9 additions and 5 deletions
--- a/src/app/pages/page-denied/page-denied.component.html
+++ b/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>
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@ -4,7 +4,7 @@

 export const environment = {
  production: false,
-  apiUrl: "http://localhost:8081",
+  apiUrl: "http://localhost:8080",
  tokenKey: "TOKEN-SIMPLEAT"
 };
Author	SHA1	Message	Date
Vincent Ramiere	e4db000be2	conflits	2022-03-13 14:25:08 +01:00
Vincent Ramiere	b8616b0eb3	page-account	2022-03-11 15:51:42 +01:00
Vincent Ramiere	14a8c1b45c	environnement.ts	2022-03-11 15:38:59 +01:00
Vincent Ramiere	c0046df8fb	Merge branch 'dev' into Vincent css	2022-03-11 15:36:11 +01:00
Vincent Ramiere	2502cd88bd	modif css search-bar	2022-03-11 15:34:20 +01:00