1 files changed, 0 insertions, 4 deletions
diff --git a/lib/log.c b/lib/log.c
index c1c11e61..407904d5 100644
--- a/lib/log.c
+++ b/lib/log.c
@@ -1,9 +1,5 @@
 /*
-<<<<<<< HEAD:lib/log.c
- * $Id: log.c,v 1.34 2008/02/28 23:26:02 paul Exp $
-=======
  * $Id$
->>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:lib/log.c
  *
  * Logging of zebra
  * Copyright (C) 1997, 1998, 1999 Kunihiro Ishiguro