diff options
| author | Miles Bader | 2004-02-25 01:19:08 +0000 |
|---|---|---|
| committer | Miles Bader | 2004-02-25 01:19:08 +0000 |
| commit | b9db45677aa477f9728e0071b1aea21d93e2e52c (patch) | |
| tree | f68a10cc42adad244385f2e9081c070807174be2 | |
| parent | ac4780a12cd50a1e185a88a19236c705554d463b (diff) | |
| download | emacs-b9db45677aa477f9728e0071b1aea21d93e2e52c.tar.gz emacs-b9db45677aa477f9728e0071b1aea21d93e2e52c.zip | |
Resolve CVS conflicts
| -rw-r--r-- | lisp/progmodes/ebnf-abn.el | 3 |
1 files changed, 1 insertions, 2 deletions
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'." | |||
| 659 | 659 | ||
| 660 | (provide 'ebnf-abn) | 660 | (provide 'ebnf-abn) |
| 661 | 661 | ||
| 662 | 662 | ;;; arch-tag: 8d1b3c4d-4226-4393-b9ae-b7ccf07cf779 | |
| 663 | ;;; arch-tag: | ||
| 664 | ;;; ebnf-abn.el ends here | 663 | ;;; ebnf-abn.el ends here |