]> git.openstreetmap.org Git - nominatim.git/tree
fix merge issues
-rw-r--r-- 396 .codespellrc
drwxr-xr-x - .github
-rw-r--r-- 93 .gitignore
-rw-r--r-- 115 .gitmodules
-rw-r--r-- 380 .mypy.ini
-rw-r--r-- 771 .pylintrc
-rw-r--r-- 269 AUTHORS
-rw-r--r-- 10061 CMakeLists.txt
-rw-r--r-- 4125 CONTRIBUTING.md
-rw-r--r-- 18092 COPYING
-rw-r--r-- 23264 ChangeLog
-rw-r--r-- 526 Makefile
-rw-r--r-- 2278 README.md
-rw-r--r-- 1835 SECURITY.md
-rw-r--r-- 6092 VAGRANT.md
-rw-r--r-- 2890 Vagrantfile
drwxr-xr-x - cmake
drwxr-xr-x - data
drwxr-xr-x - docs
drwxr-xr-x - lib-php
drwxr-xr-x - lib-sql
drwxr-xr-x - man
drwxr-xr-x - module
drwxr-xr-x - munin
-rwxr-xr-x 509 nominatim-cli.py
m--------- - osm2pgsql
drwxr-xr-x - packaging
-rw-r--r-- 5356 phpcs.xml
drwxr-xr-x - settings
drwxr-xr-x - src
drwxr-xr-x - test
drwxr-xr-x - utils
drwxr-xr-x - vagrant