fixin bug

Author: upkarlidder

.env.sample

@@ -1,4 +1,4 @@
-# IBM IoT
+# this is how to connect to the database.
 MARIADB_HOST=
 MARIADB_PORT=
 MARIADB_USERNAME=

app.py

@@ -8,12 +8,15 @@
 @app.route('/')
 def index():
     return render_template("index.html")
+ # this is me typing a comment in the application, it's weird that i have to do this.
+ # this is me adding another comment trying to figure something out.
 
 
 @app.route("/healthz")
 def healthz():
     resp = Response("ok")
     resp.headers['Custom-Header'] = 'Awesome'
+    # this is awesome tying things
     return resp
 
 if __name__ == "__main__":

manifest.yaml

@@ -4,4 +4,5 @@ applications:
     memory: 256M
     instances: 1
     port: 5000
-    
+
+# this is me adding another comment.

static/css/style.css

@@ -1,9 +1,9 @@
 body,html {
 
     margin: 0;
-     
+
   }
-  
+
   .image {
     background-image: url("../images/IBM_Microbites_MockSite_120820.png")
     /*background-image: url("../images/IBM_Error500_MockSite_120820.jpg");*/

util/MicroBites.py

@@ -37,7 +37,11 @@
 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
                             +"/prometeo")
 
 DB_ENGINE = sqlalchemy.MetaData(SQLALCHEMY_DATABASE_URI).bind