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

fixing merging errors

Browse source
This commit is contained in:
nbillard 2022-12-16 09:45:20 +01:00
commit c7a7cde2e1
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
request.sql
View file

@ -1,10 +1,7 @@
-- | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20 | 21 |
-- --------+---+---+---+---+---+---+---+---+---+----+----+----+----+----+----+----+----+----+----+----+----+
<<<<<<< HEAD
-- Axel | | | O | O | | | | | | | | x | O | | | | | | | | |
=======
-- Axel | | | O | O | | | | | | | | x | x | | | | | | | | |
-- Axel | | | O | O | | | | | | | | O | O | | | | | | | | |
-- --------+---+---+---+---+---+---+---+---+---+----+----+----+----+----+----+----+----+----+----+----+----+
-- Ronan | | O | | | | O | | | | O | | | | | | x | | | | | |
-- --------+---+---+---+---+---+---+---+---+---+----+----+----+----+----+----+----+----+----+----+----+----+