From 59f9616f53288268c34b9906bde436b3b29eadcb Mon Sep 17 00:00:00 2001
From: cyrilled <desmocyr@go.local>
Date: Tue, 28 Feb 2017 10:56:02 +0100
Subject: [PATCH] tab 1

---
 docs/res/CR003.rst | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docs/res/CR003.rst b/docs/res/CR003.rst
index 981b25f..d1b81bb 100644
--- 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.