# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1080776802 0
# Node ID 6e794586bfc89d28e8d602cc6fa36f518a364d98
# Parent  24f516c10cb83bcea2bba332195fbe74fc90ce99
Resolve CVS conflicts

diff -r 24f516c10cb8 -r 6e794586bfc8 lisp/progmodes/ebnf-ebx.el
--- a/lisp/progmodes/ebnf-ebx.el	Wed Mar 31 23:46:23 2004 +0000
+++ b/lisp/progmodes/ebnf-ebx.el	Wed Mar 31 23:46:42 2004 +0000
@@ -668,6 +668,5 @@
 
 (provide 'ebnf-ebx)
 
-
-;;; arch-tag:
+;;; arch-tag: bfe2f95b-66bc-4dc6-8b7e-b7831e68f5fb
 ;;; ebnf-ebx.el ends here