Summary: 099r45

diff --git a/src/ChangeLog b/src/ChangeLog
index 6443b0cab47fa4c1fdf6385483a9ca7eb75925e2..f16e6f02d19172194644c784be3b09a804df1b13 100644 (file)
--- 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