tab 1

ScribesZone · Feb 28, 2017 · 59f9616 · 59f9616
1 parent f8b45af
commit 59f9616
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/docs/res/CR003.rst b/docs/res/CR003.rst
@@ -80,11 +80,7 @@ CR003
         +-----+---------+----------------------------------+-------+
         |  A2 | GX      | xxMAxxxxxxxx xxxxxSD 23:00-05:00 | X     |
         |     |         |                                  |       |
-<<<<<<< Updated upstream
         |     |         | 17/02 - 18/02                    |       |
-=======
-        |     |         | 17/03 - 18/04              |       |
->>>>>>> Stashed changes
         +-----+---------+----------------------------------+-------+
 
 #. Les autorisations sous forme de triplets pourraient aussi convenir a priori pour le stade de Londres en 217.