rbonnet/tp_bdd2
1
1
Fork 0
Code Issues Pull requests Releases Wiki Activity

git error fixed

Browse source
This commit is contained in:
nbillard 2022-12-16 09:44:51 +01:00
parent 0393829d7f
commit c7492f86c7
2 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
insert.sql
View file

@ -554,8 +554,6 @@ INSERT INTO Enseignant_Chercheur VALUES (
); );
>>>>>>> b119cf9702250b937e1c924da94fb625026da004
---------------------------------------------------------------------- ----------------------------------------------------------------------
-- -- -- --
-- Evenement -- -- Evenement --

1
request.sql
View file

@ -5,7 +5,6 @@
-- Axel | | | O | O | | | | | | | | x | O | | | | | | | | | -- Axel | | | O | O | | | | | | | | x | O | | | | | | | | |
======= =======
-- Axel | | | O | O | | | | | | | | x | x | | | | | | | | | -- Axel | | | O | O | | | | | | | | x | x | | | | | | | | |
>>>>>>> 1a38bf8865af3e2e64d57867ce98f7f521a5b0a3
-- --------+---+---+---+---+---+---+---+---+---+----+----+----+----+----+----+----+----+----+----+----+----+ -- --------+---+---+---+---+---+---+---+---+---+----+----+----+----+----+----+----+----+----+----+----+----+
-- Ronan | | O | | | | O | | | | O | | | | | | x | | | | | | -- Ronan | | O | | | | O | | | | O | | | | | | x | | | | | |
-- --------+---+---+---+---+---+---+---+---+---+----+----+----+----+----+----+----+----+----+----+----+----+ -- --------+---+---+---+---+---+---+---+---+---+----+----+----+----+----+----+----+----+----+----+----+----+