format code (#14)

2023-12-25 10:17:13 +08:00
parent 8a65ad888e
commit 6858ec5f38
30 changed files with 1062 additions and 771 deletions
--- a/python/util/db_conn.py
+++ b/python/util/db_conn.py
@@ -49,11 +49,7 @@ class Postgres(object):
                cur = self.conn.cursor()
                cur.execute(sql)
                updated_rows = cur.rowcount
-<<<<<<< HEAD
                self.conn.commit()
-=======
-                conn.commit()
->>>>>>> upstream/main
                cur.close()
                return updated_rows
            except Exception as e: