evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove some merge noise

Browse Source
This commit is contained in:
Worros 2009-04-28 14:50:50 +08:00
parent d2c978d7f5
commit f6311276a7
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pyfpdb/fpdb.py
View File

@ -267,7 +267,6 @@ class fpdb:
self.settings['db-databaseName'], self.settings['db-databaseName'],
self.settings['db-user'], self.settings['db-user'],
self.settings['db-password']) self.settings['db-password'])
<<<<<<< HEAD:pyfpdb/fpdb.py
if self.db.wrongDbVersion: if self.db.wrongDbVersion:
diaDbVersionWarning = gtk.Dialog(title="Strong Warning - Invalid database version", parent=None, flags=0, buttons=(gtk.STOCK_OK,gtk.RESPONSE_OK)) diaDbVersionWarning = gtk.Dialog(title="Strong Warning - Invalid database version", parent=None, flags=0, buttons=(gtk.STOCK_OK,gtk.RESPONSE_OK))