changeset 52910:0746b84b7c15

Resolve CVS conflicts
author Miles Bader <miles@gnu.org>
date Wed, 22 Oct 2003 08:30:07 +0000
parents 8b6f25832ac6
children 5d2ffd652f23
files lisp/progmodes/cfengine.el
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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