Fix merge gone wrong.

2009-11-09 19:31:32 -05:00 · 2009-11-09 19:31:32 -05:00 · 1b980e7cad
commit 1b980e7cad
parent 5021cae297
1 changed files with 2 additions and 1 deletions
--- a/pyfpdb/SQL.py
+++ b/pyfpdb/SQL.py
@ -2942,8 +2942,9 @@ class Sql:
                        ,hc_position
                        ,hp.tourneyTypeId
                        ,date_format(h.handStart, 'd%y%m%d')
->>>>>>> 28ca49d592c8e706ad6ee58dd26655bcc33fc5fb:pyfpdb/SQL.py
 """
+#>>>>>>> 28ca49d592c8e706ad6ee58dd26655bcc33fc5fb:pyfpdb/SQL.py
+#"""
        elif db_server == 'postgresql':
            self.query['rebuildHudCache'] = """
                INSERT INTO HudCache