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>