From 515557d45efe92a3e116a0b893da327a120522b8 Mon Sep 17 00:00:00 2001 From: Eric Blade Date: Sun, 5 Dec 2010 16:48:12 -0500 Subject: [PATCH] fix merge error --- pyfpdb/HUD_main.pyw | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyfpdb/HUD_main.pyw b/pyfpdb/HUD_main.pyw index 02569c9f..b7b3fa28 100644 --- a/pyfpdb/HUD_main.pyw +++ b/pyfpdb/HUD_main.pyw @@ -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: