Merge remote-tracking branch 'upstream/master'

[nominatim.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 44b8eb32203dfeb897a8f4d3a1243c7a536b6ee1..23bcdb1c6b08a00b8367320430f829be4bba95f6 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,13 @@
 *.log
 *.pyc
 *.log
 *.pyc

+*.swp

 
 

-build
-settings/local.php
+docs/develop/*.png
+site-html

 
 

-data/wiki_import.sql
-data/wiki_specialphrases.sql
-data/osmosischange.osc
+build
+dist
+.coverage

 
 .vagrant
 data/country_osm_grid.sql.gz
 
 .vagrant
 data/country_osm_grid.sql.gz