From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Sat, 9 May 2015 16:08:32 +0000 (+0200)
Subject: Remove conflict  +typo.
X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/rce2015.git/commitdiff_plain/30a67f26a836be8200ee49398df2e69bcb9a58ac?ds=sidebyside;hp=30a67f26a836be8200ee49398df2e69bcb9a58ac

Remove conflict  +typo.
---