fix after merge

This commit is contained in:
knst-kotov
2021-07-13 10:14:48 +00:00
parent af0211721c
commit 6c9337be4c
13 changed files with 802 additions and 806 deletions

View File

@@ -1,9 +1,5 @@
import uvicorn
from settings import PORT
if __name__ == '__main__':
<<<<<<< HEAD
uvicorn.run("main:app", host="0.0.0.0", port=8081, ssl_keyfile="discours.key", ssl_certfile="discours.crt", reload=True)
=======
uvicorn.run("main:app", host="0.0.0.0", port=PORT, reload=True)
>>>>>>> remotes/origin/dev
import uvicorn
from settings import PORT
if __name__ == '__main__':
uvicorn.run("main:app", host="0.0.0.0", port=PORT, ssl_keyfile="discours.key", ssl_certfile="discours.crt", reload=True)