summaryrefslogtreecommitdiff
path: root/src/ivy.c
diff options
context:
space:
mode:
authorlecoanet1998-12-11 17:24:48 +0000
committerlecoanet1998-12-11 17:24:48 +0000
commit25c512868d7948bc02ba91e9f06d398c31b0bedf (patch)
treedef6b2544cf3c81068bac6788f4ab9465de236b7 /src/ivy.c
parent34ace791502635f9bc725192bc609994e9f9b730 (diff)
downloadivy-c-25c512868d7948bc02ba91e9f06d398c31b0bedf.zip
ivy-c-25c512868d7948bc02ba91e9f06d398c31b0bedf.tar.gz
ivy-c-25c512868d7948bc02ba91e9f06d398c31b0bedf.tar.bz2
ivy-c-25c512868d7948bc02ba91e9f06d398c31b0bedf.tar.xz
Modification pour debianisation
Diffstat (limited to 'src/ivy.c')
-rw-r--r--src/ivy.c4
1 files changed, 0 insertions, 4 deletions
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>