bug 9459 fix merge conflict

This commit is contained in:
prculley 2016-05-24 08:56:19 -05:00
parent 54d9d45486
commit 8b6bd226af

View File

@ -89,7 +89,7 @@ def importData(database, filename, user):
gramps = True gramps = True
ifile.close() ifile.close()
if not gramps and ansel: if not gramps and ansel and user.uistate:
top = Glade() top = Glade()
code = top.get_object('codeset') code = top.get_object('codeset')
code.set_active(0) code.set_active(0)