fixing merges

added cd to directory
2023-09-03 23:46:19 -04:00 · 2023-09-03 23:43:38 -04:00
4 changed files with 5 additions and 1 deletions
--- a/pycache/main.cpython-310.pyc
+++ b/pycache/main.cpython-310.pyc
--- a/instance/jobs.db
+++ b/instance/jobs.db
--- 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
--- a/start.sh
+++ b/start.sh
Author	SHA1	Message	Date
jerick	ff1f9ef074	fixing merges	2023-09-03 23:46:19 -04:00
jerick	14428af539	added cd to directory	2023-09-03 23:43:38 -04:00