From c260f0b30f1e64c142de9fc47b98829a5a969eac Mon Sep 17 00:00:00 2001
From: David Surville <david.surville@unicaen.fr>
Date: Wed, 8 Jul 2015 12:14:15 +0000
Subject: [PATCH] =?UTF-8?q?r=C3=A9solution=20conflit=20svn?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-- 
GitLab