fixed merge conflict in update of the docu.

This commit is contained in:
2020-05-15 21:17:32 +02:00
parent c7e4664e89
commit 259423132b
29 changed files with 13657 additions and 2129 deletions

View File

@ -4,7 +4,7 @@
*
* Sphinx JavaScript utilities for the full-text search.
*
* :copyright: Copyright 2007-2020 by the Sphinx team, see AUTHORS.
* :copyright: Copyright 2007-2019 by the Sphinx team, see AUTHORS.
* :license: BSD, see LICENSE for details.
*
*/