X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=merge.c;h=18882e92b92251f7c3f83f75938117f20a579857;hb=995abb98512fb6ecf7a4529f8e3890a17839cfe0;hp=c51474c753bd06b0866878d284159771e4cdcebe;hpb=05d5b193ee05a187d4f3fd05a4be1fbb6bf937b6;p=onak.git

diff --git a/merge.c b/merge.c
index c51474c..18882e9 100644
--- a/merge.c
+++ b/merge.c
@@ -4,8 +4,6 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
- *
- * $Id: merge.c,v 1.11 2003/06/07 13:45:35 noodles Exp $
  */
 
 #include <assert.h>