Merge branch 'master' of git://git.assembla.com/fpdboz.git

Conflicts: pyfpdb/GuiBulkImport.py pyfpdb/fpdb_simple.py
2009-03-28 12:27:45 -04:00
parent eb514902ee 0528aa74db
commit f54da25d2b
4 changed files with 11 additions and 20 deletions
@@ -236,7 +236,6 @@ def main(argv=None):
    if os.name == 'nt': settings['os'] = 'windows'
    else:               settings['os'] = 'linuxmac'

-#    settings.update(config.get_db_parameters('fpdb'))
    settings.update(config.get_db_parameters())
    settings.update(config.get_tv_parameters())
    settings.update(config.get_import_parameters())