Add assert for invalid armor parameters.

[onak.git] / merge.h

diff --git a/merge.h b/merge.h
index da8534ff59232ceb31b688e4a72fbf3d80caad05..bbefcc3e3bf3f0deb27ef7433d2c045af18cfd1f 100644 (file)
--- 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__