diff options
| author | Miles Bader <miles@gnu.org> | 2004-03-31 23:46:42 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2004-03-31 23:46:42 +0000 |
| commit | 4c8919e06e5cfc72ebf1075b51f0de58b6414cf6 (patch) | |
| tree | ec5d40b4c005c6be6f4f5084a549f2cb19603046 | |
| parent | 606ebcd1777b6806bcae67b89ab359d82a51102e (diff) | |
| download | emacs-4c8919e06e5cfc72ebf1075b51f0de58b6414cf6.tar.gz emacs-4c8919e06e5cfc72ebf1075b51f0de58b6414cf6.tar.bz2 emacs-4c8919e06e5cfc72ebf1075b51f0de58b6414cf6.zip | |
Resolve CVS conflicts
| -rw-r--r-- | lisp/progmodes/ebnf-ebx.el | 3 |
1 files changed, 1 insertions, 2 deletions
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 |