From 8a55b2ebd9d231b6ce6339daf3dc602b4858ff04 Mon Sep 17 00:00:00 2001 From: Worros Date: Tue, 9 Jun 2009 23:10:11 +0800 Subject: [PATCH] Remove merge line --- pyfpdb/Database.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py index 76052d54..9582354a 100644 --- a/pyfpdb/Database.py +++ b/pyfpdb/Database.py @@ -337,7 +337,6 @@ if __name__=="__main__": # stat_dict = db_connection.get_stats_from_hand(h, hero) # for p in stat_dict.keys(): # print p, " ", stat_dict[p] ->>>>>>> 7ef6a533ec6c73d5815ace42168067a6f8c26e3a:pyfpdb/Database.py print "cards =", db_connection.get_cards(u'1') db_connection.close_connection