stc

commit bd49f26bf28ecb721a9709e986136e6ee66986cd
parent 1984482b19996ab67f0b9f36506c2abd4e513bdb
Author: Brennen T. Mazur <brennen@madis.cool>
Date:   Sun,  8 Jan 2023 11:05:05 -0700

fixed my merge goof

Diffstat:
M
app.py
 | 
12
+-----------

1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/app.py b/app.py
@@ -10,16 +10,6 @@ OrganizationName = "Youth Employment Program"
 
 app = Flask(__name__)
 
-<<<<<<< HEAD
-# Mongo setup ##Do we need a ConnectionFailure check? pymongo.errors import ConnectionFailure
-##              client = MongoClient()
-##              try:
-##                  client.admin.command('ping')
-##              except ConnectionFailure:
-##                  print("Server not available")
-##          Then bcrypt, create db and create collections
-client = MongoClient()
-=======
 # urllib.parse
 username = urllib.parse.quote_plus('user')
 password = urllib.parse.quote_plus('pass/word')
@@ -32,7 +22,7 @@ client = MongoClient('simple-time-card.com',
                     password='password',
                     authSource='users-collection',
                     authMechanism='SCRAM-SHA-256')
->>>>>>> 61b3589d576984c0160559d5480e913c99dd7345
+
 client = MongoClient('localhost', 27017)
 bcrypt = Bcrypt(app)
 db = client['simple_timecard_database']