Resolve CVS conflicts

4c8919e0 · Miles Bader · 606ebcd1 · 4c8919e0
Commit 4c8919e0 authored Mar 31, 2004 by Miles Bader
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

lisp/progmodes/ebnf-ebx.el lisp/progmodes/ebnf-ebx.el +1 -2

No files found.
--- a/lisp/progmodes/ebnf-ebx.el
+++ b/lisp/progmodes/ebnf-ebx.el
@@ -668,6 +668,5 @@ See documentation for variable `ebnf-ebx-lex'."

 (provide 'ebnf-ebx)

-
-;;; arch-tag:
+;;; arch-tag: bfe2f95b-66bc-4dc6-8b7e-b7831e68f5fb
 ;;; ebnf-ebx.el ends here