# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1066811407 0
# Node ID 0746b84b7c1561495c3f0b2b935247ecb48cebfd
# Parent  8b6f25832ac688801a998d0301088bf3203d15f7
Resolve CVS conflicts

diff -r 8b6f25832ac6 -r 0746b84b7c15 lisp/progmodes/cfengine.el
--- a/lisp/progmodes/cfengine.el	Wed Oct 22 02:46:08 2003 +0000
+++ b/lisp/progmodes/cfengine.el	Wed Oct 22 08:30:07 2003 +0000
@@ -243,4 +243,5 @@
 
 (provide 'cfengine)
 
+;;; arch-tag: 6b931be2-1505-4124-afa6-9675971e26d4
 ;;; cfengine.el ends here