format code (#14)

python/util/config.py

@@ -16,7 +16,9 @@ class Config:
 
     def get(self, key, default=None):
         global CF
-        return CF[self.env].get(key, default)
+        return os.environ.get(key.upper(), \
+                       CF[self.env].get(key, default)
+                      )
 
 def init(env):
     return Config(env)

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: