aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiles Bader <[email protected]>2004-02-25 01:19:08 +0000
committerMiles Bader <[email protected]>2004-02-25 01:19:08 +0000
commitb9db45677aa477f9728e0071b1aea21d93e2e52c (patch)
treef68a10cc42adad244385f2e9081c070807174be2
parentac4780a12cd50a1e185a88a19236c705554d463b (diff)
Resolve CVS conflicts
-rw-r--r--lisp/progmodes/ebnf-abn.el3
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/progmodes/ebnf-abn.el b/lisp/progmodes/ebnf-abn.el
index 35cbf2c928..ec96109e0a 100644
--- a/lisp/progmodes/ebnf-abn.el
+++ b/lisp/progmodes/ebnf-abn.el
@@ -659,6 +659,5 @@ See documentation for variable `ebnf-abn-lex'."
(provide 'ebnf-abn)
-
-;;; arch-tag:
+;;; arch-tag: 8d1b3c4d-4226-4393-b9ae-b7ccf07cf779
;;; ebnf-abn.el ends here