Changeset 0852dbb in osmose-backend


Ignore:
Timestamp:
Mar 13, 2014 10:32:37 PM (6 years ago)
Author:
Jocelyn Jaubert <jocelyn.jaubert@…>
Branches:
master
Children:
5c09fed, ea1a9cc
Parents:
caaacfc (diff), e93776b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge remote-tracking branch 'frodrigo/master'

Files:
4 added
1 edited
1 moved

Legend:

Unmodified
Added
Removed
  • osmose_config.py

    rcaaacfc r0852dbb  
    295295france_local_db.analyser["merge_parking_FR_capp"] = "xxx" 
    296296france_local_db.analyser["merge_parking_FR_cub"] = "xxx" 
    297 france_local_db.analyser["merge_tourism_FR_gironde"] = "xxx" 
     297france_local_db.analyser["merge_tourism_FR_gironde_camp_caravan"] = "xxx" 
     298france_local_db.analyser["merge_tourism_FR_gironde_museum"] = "xxx" 
     299france_local_db.analyser["merge_tourism_FR_gironde_information"] = "xxx" 
    298300 
    299301######################################################################### 
Note: See TracChangeset for help on using the changeset viewer.