Remove some merge noise

2009-04-28 14:50:50 +08:00
parent d2c978d7f5
commit f6311276a7
1 changed files with 0 additions and 1 deletions
@@ -267,7 +267,6 @@ class fpdb:
            self.settings['db-databaseName'],
            self.settings['db-user'], 
            self.settings['db-password'])
-<<<<<<< HEAD:pyfpdb/fpdb.py
        if self.db.wrongDbVersion:
            diaDbVersionWarning = gtk.Dialog(title="Strong Warning - Invalid database version", parent=None, flags=0, buttons=(gtk.STOCK_OK,gtk.RESPONSE_OK))