From f0fbe14cf58edc5a8d0f3e5199f5dd4d40fa49ee Mon Sep 17 00:00:00 2001
From: liefooga <liefooga@331e1502-861f-0410-8da2-ba01fb791d7f>
Date: Tue, 26 Jun 2007 13:34:01 +0000
Subject: [PATCH] merge ParadisEO-MOEO v-1.0

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@401 331e1502-861f-0410-8da2-ba01fb791d7f
---
 trunk/paradiseo-moeo/NEWS | 10 ----------
 1 file changed, 10 deletions(-)

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