From 54a8ab2b063ca91835c99a76f4882a97546ca366 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 4 Dec 2020 03:56:42 +0100 Subject: [PATCH] Script --- inscription.html | 8 +------- php/Script/traitementInscription.php | 6 ++++-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/inscription.html b/inscription.html index e0f12b1..95814dd 100644 --- a/inscription.html +++ b/inscription.html @@ -19,18 +19,12 @@
-<<<<<<< HEAD - - - -======= - + ->>>>>>> b9bf5b2edb8e213d4bd18f03395ccc8c4d5450d2
diff --git a/php/Script/traitementInscription.php b/php/Script/traitementInscription.php index fe7bb60..e8dcb70 100644 --- a/php/Script/traitementInscription.php +++ b/php/Script/traitementInscription.php @@ -1,4 +1,6 @@