fix merge error

This commit is contained in:
Eric Blade 2010-12-05 16:48:12 -05:00
parent 301348eb5e
commit 515557d45e

View File

@ -291,9 +291,9 @@ class HUD_main(object):
log.error(_('Table "%s" no longer exists\n') % table_name)
return
t6 = time.time()
log.info(_("HUD_main.read_stdin: hand read in %4.3f seconds (%4.3f,%4.3f,%4.3f,%4.3f,%4.3f,%4.3f)")
% (t6 - t0,t1 - t0,t2 - t0,t3 - t0,t4 - t0,t5 - t0,t6 - t0))
# t6 = time.time()
# log.info(_("HUD_main.read_stdin: hand read in %4.3f seconds (%4.3f,%4.3f,%4.3f,%4.3f,%4.3f,%4.3f)")
# % (t6 - t0,t1 - t0,t2 - t0,t3 - t0,t4 - t0,t5 - t0,t6 - t0))
self.db_connection.connection.rollback()
if type == "tour":
try: