Resolve CVS conflicts

This commit is contained in:
Miles Bader 2003-10-22 08:30:07 +00:00
parent d5e7aa502b
commit 7ae0df40c1

View file

@ -243,4 +243,5 @@ to the action header."
(provide 'cfengine)
;;; arch-tag: 6b931be2-1505-4124-afa6-9675971e26d4
;;; cfengine.el ends here