diff options
| author | Miles Bader | 2003-10-22 08:30:07 +0000 |
|---|---|---|
| committer | Miles Bader | 2003-10-22 08:30:07 +0000 |
| commit | 7ae0df40c16df2014940fa48f2f1447e0adfd253 (patch) | |
| tree | 72df42739671e209d1e56cdd4e606c6614422e6e | |
| parent | d5e7aa502ba8a7b9b47c21e73c5ef23f9de0e0ab (diff) | |
| download | emacs-7ae0df40c16df2014940fa48f2f1447e0adfd253.tar.gz emacs-7ae0df40c16df2014940fa48f2f1447e0adfd253.zip | |
Resolve CVS conflicts
| -rw-r--r-- | lisp/progmodes/cfengine.el | 1 |
1 files changed, 1 insertions, 0 deletions
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." | |||
| 243 | 243 | ||
| 244 | (provide 'cfengine) | 244 | (provide 'cfengine) |
| 245 | 245 | ||
| 246 | ;;; arch-tag: 6b931be2-1505-4124-afa6-9675971e26d4 | ||
| 246 | ;;; cfengine.el ends here | 247 | ;;; cfengine.el ends here |