From: Miles Bader <miles@gnu.org>
Date: Wed, 25 Feb 2004 01:19:08 +0000 (+0000)
Subject: Resolve CVS conflicts
X-Git-Tag: ttn-vms-21-2-B4~7470
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b9db45677aa477f9728e0071b1aea21d93e2e52c;p=emacs.git

Resolve CVS conflicts
---

diff --git a/lisp/progmodes/ebnf-abn.el b/lisp/progmodes/ebnf-abn.el
index 35cbf2c9288..ec96109e0a0 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