From c7492f86c7f4e150923ca1ed8928cf7c77619efb Mon Sep 17 00:00:00 2001 From: nbillard Date: Fri, 16 Dec 2022 09:44:51 +0100 Subject: [PATCH] git error fixed --- insert.sql | 2 -- request.sql | 1 - 2 files changed, 3 deletions(-) diff --git a/insert.sql b/insert.sql index 4202127..2fa359e 100644 --- a/insert.sql +++ b/insert.sql @@ -554,8 +554,6 @@ INSERT INTO Enseignant_Chercheur VALUES ( ); ->>>>>>> b119cf9702250b937e1c924da94fb625026da004 - ---------------------------------------------------------------------- -- -- -- Evenement -- diff --git a/request.sql b/request.sql index f2bd827..8468dfb 100644 --- a/request.sql +++ b/request.sql @@ -5,7 +5,6 @@ -- Axel | | | O | O | | | | | | | | x | O | | | | | | | | | ======= -- Axel | | | O | O | | | | | | | | x | x | | | | | | | | | ->>>>>>> 1a38bf8865af3e2e64d57867ce98f7f521a5b0a3 -- --------+---+---+---+---+---+---+---+---+---+----+----+----+----+----+----+----+----+----+----+----+----+ -- Ronan | | O | | | | O | | | | O | | | | | | x | | | | | | -- --------+---+---+---+---+---+---+---+---+---+----+----+----+----+----+----+----+----+----+----+----+----+