# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1077671948 0
# Node ID 8e0088433ac7805b2eb252a9de1a65a25f5c71cf
# Parent  766aaa5bded5b5f0e08c0d3ab1806982974d21eb
Resolve CVS conflicts

diff -r 766aaa5bded5 -r 8e0088433ac7 lisp/progmodes/ebnf-abn.el
--- a/lisp/progmodes/ebnf-abn.el	Wed Feb 25 00:07:33 2004 +0000
+++ b/lisp/progmodes/ebnf-abn.el	Wed Feb 25 01:19:08 2004 +0000
@@ -659,6 +659,5 @@
 
 (provide 'ebnf-abn)
 
-
-;;; arch-tag: 
+;;; arch-tag: 8d1b3c4d-4226-4393-b9ae-b7ccf07cf779
 ;;; ebnf-abn.el ends here