fixing merges
This commit is contained in:
4
main.py
4
main.py
@@ -129,4 +129,8 @@ api.add_resource(jobManager, '/api/jobs')
|
|||||||
|
|
||||||
#Runs the Flask app
|
#Runs the Flask app
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
<<<<<<< HEAD
|
||||||
app.run(debug=True)
|
app.run(debug=True)
|
||||||
|
=======
|
||||||
|
app.run(debug=False)
|
||||||
|
>>>>>>> a21c4bf53294a9d71093572e3e30f1010607e015
|
||||||
|
|||||||
Reference in New Issue
Block a user