verif
This commit is contained in:
parent
a5f8e10aa2
commit
4b10960648
1 changed files with 1 additions and 5 deletions
|
@ -1,11 +1,7 @@
|
||||||
|
|
||||||
-- | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20 | 21 |
|
-- | 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 | | | | | | | | O | O | | | | | | | | |
|
||||||
-- Axel | | | O | O | | | | | | | | x | O | | | | | | | | |
|
|
||||||
=======
|
|
||||||
-- Axel | | | O | O | | | | | | | | x | x | | | | | | | | |
|
|
||||||
>>>>>>> 1a38bf8865af3e2e64d57867ce98f7f521a5b0a3
|
|
||||||
-- --------+---+---+---+---+---+---+---+---+---+----+----+----+----+----+----+----+----+----+----+----+----+
|
-- --------+---+---+---+---+---+---+---+---+---+----+----+----+----+----+----+----+----+----+----+----+----+
|
||||||
-- Ronan | | O | | | | O | | | | O | | | | | | x | | | | | |
|
-- Ronan | | O | | | | O | | | | O | | | | | | x | | | | | |
|
||||||
-- --------+---+---+---+---+---+---+---+---+---+----+----+----+----+----+----+----+----+----+----+----+----+
|
-- --------+---+---+---+---+---+---+---+---+---+----+----+----+----+----+----+----+----+----+----+----+----+
|
||||||
|
|
Loading…
Reference in a new issue