From: N. Brouard <brouard@ined.fr>
Date: Sat, 29 Apr 2023 10:53:45 +0000 (+0000)
Subject: Summary: 099r45
X-Git-Tag: imach-099s7~50
X-Git-Url: https://henry.ined.fr/git/?a=commitdiff_plain;h=fdccc97e2fca6554343a69382b2f982079fdf831;p=.git

Summary: 099r45
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 6443b0c..f16e6f0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< ChangeLog
 2023-04-29  Nicolas Brouard  <brouard@ined.fr>
 
 	* imach.c (Module): Inverting the model equation and fixingg bugs