]> git.openstreetmap.org Git - nominatim.git/commit
Resolve conflicts
authorAntoJvlt <antonin.jolivat@gmail.com>
Mon, 17 May 2021 11:52:35 +0000 (13:52 +0200)
committerAntoJvlt <antonin.jolivat@gmail.com>
Mon, 17 May 2021 11:52:35 +0000 (13:52 +0200)
commit3206bf59df0213d24bd3e11df7dd2abaebf89911
tree7a515fb30785d1b69b1644a3fb43bb72682c88f4
parenta33f2c0f5ba43df533b6e137f9151fe67feb20a1
parent925726222f76a3cc73263bd56ef593afaa83c865
Resolve conflicts
docs/admin/Import.md
nominatim/tokenizer/legacy_icu_tokenizer.py
nominatim/tokenizer/legacy_tokenizer.py
test/bdd/steps/nominatim_environment.py
test/python/dummy_tokenizer.py
test/python/test_cli.py
test/python/test_tokenizer_legacy.py
test/python/test_tokenizer_legacy_icu.py