From: Miles Bader <miles@gnu.org>
Date: Wed, 22 Oct 2003 08:30:07 +0000 (+0000)
Subject: Resolve CVS conflicts
X-Git-Tag: ttn-vms-21-2-B4~8486
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7ae0df40c16df2014940fa48f2f1447e0adfd253;p=emacs.git

Resolve CVS conflicts
---

diff --git a/lisp/progmodes/cfengine.el b/lisp/progmodes/cfengine.el
index 76b4efccdd2..1f15184f552 100644
--- a/lisp/progmodes/cfengine.el
+++ b/lisp/progmodes/cfengine.el
@@ -243,4 +243,5 @@ to the action header."
 
 (provide 'cfengine)
 
+;;; arch-tag: 6b931be2-1505-4124-afa6-9675971e26d4
 ;;; cfengine.el ends here