fixing merges

2023-09-03 23:46:19 -04:00
parent 14428af539 a21c4bf532
commit ff1f9ef074
2 changed files with 5 additions and 0 deletions
--- a/main.py
+++ b/main.py
@@ -129,4 +129,8 @@ api.add_resource(jobManager, '/api/jobs')

 #Runs the Flask app
 if __name__ == '__main__':
+<<<<<<< HEAD
    app.run(debug=True)
+=======
+    app.run(debug=False)
+>>>>>>> a21c4bf53294a9d71093572e3e30f1010607e015