From: Karine Deschinkel <kdeschin@grappa.iut-bm.univ-fcomte.fr>
Date: Fri, 4 Sep 2015 08:36:13 +0000 (+0200)
Subject: fixed conflict
X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/JournalMultiPeriods.git/commitdiff_plain/6a0a093a654ceb1379ce0aa8439c1650c04f9929?ds=sidebyside;hp=6a0a093a654ceb1379ce0aa8439c1650c04f9929

fixed conflict
---