diff --git a/trunk/paradiseo-moeo/NEWS b/trunk/paradiseo-moeo/NEWS
index b54ffafe3..52e218e1c 100644
--- a/trunk/paradiseo-moeo/NEWS
+++ b/trunk/paradiseo-moeo/NEWS
@@ -1,11 +1 @@
-<<<<<<< .courant
-* release 1.0.alpha
-
-# Local Variables:
-# coding: iso-8859-1
-# mode: text
-# fill-column: 80
-# End:
-=======
 * release 1.0
->>>>>>> .fusion-droit.r399