X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fconflict.c;h=07e77fc97eda8648d9b1be3f9f37eb10c557bcb0;hp=8247ff0cf32912e97cdc6ce78849d8e77ecd18bd;hb=5dd6771b28c257af405d7248639ed0e3bcdce38b;hpb=bd7d13ad3cdf433d73849b3bb847eaec2f1396ba

diff --git a/uip/conflict.c b/uip/conflict.c
index 8247ff0..07e77fc 100644
--- a/uip/conflict.c
+++ b/uip/conflict.c
@@ -2,8 +2,6 @@
 /*
  * conflict.c -- check for conflicts in mail system
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.