cscvs to tla changeset 78

[onak.git] / merge.c

diff --git a/merge.c b/merge.c
index 33924f05e3078b886a94afb702b4e331b9a9f51f..6ed0a2d139a40af796251862a7cb624f4fc6deeb 100644 (file)
--- a/merge.c
+++ b/merge.c
@@ -4,6 +4,8 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple

+ *
+ * $Id: merge.c,v 1.10 2003/06/04 20:57:11 noodles Exp $

  */
 
 #include <assert.h>
  */
 
 #include <assert.h>