remove merge comment

2009-12-16 18:15:07 +00:00 · 2009-12-16 18:15:07 +00:00 · 97842c1be3
commit 97842c1be3
parent 69168ff868
1 changed files with 0 additions and 2 deletions
--- a/pyfpdb/SQL.py
+++ b/pyfpdb/SQL.py
@ -2789,8 +2789,6 @@ class Sql:
                        ,hp.tourneyTypeId
                        ,date_format(h.handStart, 'd%y%m%d')
 """
-#>>>>>>> 28ca49d592c8e706ad6ee58dd26655bcc33fc5fb:pyfpdb/SQL.py
-#"""
        elif db_server == 'postgresql':
            self.query['rebuildHudCache'] = """
                INSERT INTO HudCache