From 1b980e7cad3217d4a89466c74f3bbb523c8fb93e Mon Sep 17 00:00:00 2001
From: Eratosthenes <ray.barker@hughes.net>
Date: Mon, 9 Nov 2009 19:31:32 -0500
Subject: [PATCH] Fix merge gone wrong.

---
 pyfpdb/SQL.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pyfpdb/SQL.py b/pyfpdb/SQL.py
index de847d98..3846a371 100644
--- 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