fixing merging errors

git error fixed
2022-12-16 09:45:20 +01:00 · 2022-12-16 09:44:51 +01:00
1 changed files with 0 additions and 2 deletions
--- a/insert.sql
+++ b/insert.sql
@ -554,8 +554,6 @@ INSERT INTO Enseignant_Chercheur VALUES (
 );
 >>>>>>> b119cf9702250b937e1c924da94fb625026da004
 ----------------------------------------------------------------------
 --                                                                  --
 --                    Evenement                                     --
Author	SHA1	Message	Date
nbillard	c7a7cde2e1	fixing merging errors	2022-12-16 09:45:20 +01:00
nbillard	c7492f86c7	git error fixed	2022-12-16 09:44:51 +01:00