X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=merge.h;h=bbefcc3e3bf3f0deb27ef7433d2c045af18cfd1f;hb=a047e3e158d560af079bec920460711d8222317c;hp=da8534ff59232ceb31b688e4a72fbf3d80caad05;hpb=cfbbd6655346497ab28d50d2b5c34f0c5d9ce5ce;p=onak.git

diff --git a/merge.h b/merge.h
index da8534f..bbefcc3 100644
--- a/merge.h
+++ b/merge.h
@@ -4,8 +4,6 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
- *
- * $Id: merge.h,v 1.6 2004/05/31 14:16:49 noodles Exp $
  */
 
 #ifndef __MERGE_H__