From: Miles Bader <miles@gnu.org>
Date: Mon, 16 Feb 2004 21:57:42 +0000 (+0000)
Subject: Resolve CVS conflicts
X-Git-Tag: ttn-vms-21-2-B4~7575
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d366d62b96a0d440386407c741e42cfc00946051;p=emacs.git

Resolve CVS conflicts
---

diff --git a/lisp/mail/rmail-spam-filter.el b/lisp/mail/rmail-spam-filter.el
index f3bc0bcaa68..43177b7c99b 100644
--- a/lisp/mail/rmail-spam-filter.el
+++ b/lisp/mail/rmail-spam-filter.el
@@ -632,4 +632,5 @@ automatically, no user input is required."
 
 (provide 'rmail-spam-filter)
 
+;;; arch-tag: 03e1d45d-b72f-4dd7-8f04-e7fd78249746
 ;;; rmail-spam-fitler ends here