From 25c512868d7948bc02ba91e9f06d398c31b0bedf Mon Sep 17 00:00:00 2001
From: lecoanet
Date: Fri, 11 Dec 1998 17:24:48 +0000
Subject: Modification pour debianisation

---
 src/ivy.c | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/ivy.c')

diff --git a/src/ivy.c b/src/ivy.c
index 28fb29f..1d750a7 100644
--- a/src/ivy.c
+++ b/src/ivy.c
@@ -1,10 +1,6 @@
 /*
  *
-<<<<<<< ivy.c
  * $Id$
-=======
- * $Id$
->>>>>>> 1.2
  */
 #include <stdlib.h>
 
-- 
cgit v1.1