fixing another thing

blue007ms · Dec 11, 2020 · 2bdf199 · 2bdf199
1 parent 5f1dd27
commit 2bdf199
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/util/MicroBites.py b/util/MicroBites.py
@@ -37,11 +37,7 @@
 SQLALCHEMY_DATABASE_URI = ("mysql+pymysql://"+ os.getenv('MARIADB_USERNAME')
                             +":"+ os.getenv("MARIADB_PASSWORD")
                             +"@"+ os.getenv("MARIADB_HOST")
-<<<<<<< HEAD:util/MicroBites.py
-                            +":" + str(os.getenv("MARIADB_PORT"))
-=======
-                            +":3223"
->>>>>>> 3c39a836ed0520fb6a0385852f6f9cfacc316174:util/MicroBytes.py
+                            +":" + str(os.getenv("MARIADB_HOST"))
                             +"/prometeo")
 
 DB_ENGINE = sqlalchemy.MetaData(SQLALCHEMY_DATABASE_URI).bind