Merge potlatch_010 properly.

[rails.git] / config / potlatch / autocomplete.txt

diff --git a/config/potlatch/autocomplete.txt b/config/potlatch/autocomplete.txt
index dfe4997caf7e9a47950094be2884d57846a2b618..7417f839bcf4dca192c4ba2a8e8ea1bba4dab426 100755 (executable)
--- a/config/potlatch/autocomplete.txt
+++ b/config/potlatch/autocomplete.txt
@@ -25,7 +25,7 @@ amenity/way           parking,bicycle_parking,car_rental,car_sharing,public_building,grav
 shop/POI               supermarket,convenience,bicycle,outdoor
 shop/way               supermarket
 tourism/POI            information,camp_site,caravan_site,caravan_site,picnic_site,viewpoint,theme_park,hotel,motel,guest_house,hostel,attraction,zoo
 shop/POI               supermarket,convenience,bicycle,outdoor
 shop/way               supermarket
 tourism/POI            information,camp_site,caravan_site,caravan_site,picnic_site,viewpoint,theme_park,hotel,motel,guest_house,hostel,attraction,zoo

-tourism/way            camp_site,caravan_site,picnic_site,theme_parkattraction,zoo
+tourism/way            camp_site,caravan_site,picnic_site,theme_park,attraction,zoo

 historic/POI   castle,monument,memorial,museum,archaeological_site,icon,ruins
 historic/way   archaeological_site,ruins
 landuse/POI            farm,quarry,landfill,basin,reservoir,forest,allotments,residential,retail,commercial,industrial,brownfield,greenfield,cemetery,village_green,recreation_ground
 historic/POI   castle,monument,memorial,museum,archaeological_site,icon,ruins
 historic/way   archaeological_site,ruins
 landuse/POI            farm,quarry,landfill,basin,reservoir,forest,allotments,residential,retail,commercial,industrial,brownfield,greenfield,cemetery,village_green,recreation_ground