From: Miles Bader Date: Wed, 31 Mar 2004 23:46:42 +0000 (+0000) Subject: Resolve CVS conflicts X-Git-Tag: ttn-vms-21-2-B4~7010 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4c8919e06e5cfc72ebf1075b51f0de58b6414cf6;p=emacs.git Resolve CVS conflicts --- diff --git a/lisp/progmodes/ebnf-ebx.el b/lisp/progmodes/ebnf-ebx.el index bdd4dd030d3..4e9fc24ade1 100644 --- 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