fix after merge

schema.graphql

@@ -64,8 +64,6 @@ type Mutation {
   requestEmailConfirmation: User!
   requestPasswordReset(email: String!): Boolean!
   resetPassword(password: String!, token: String!): Token!
-  signIn(email: String!, password: String!): Token!
-  # signUp(email: String!, password: String!, username: String): User!
   registerUser(input: registerUserInput!): User!
 
   # shout
@@ -136,7 +134,9 @@ type Proposal {
 
 type Subscription {
   messageCreated: Message!
+  messageUpdated: Message!
   messageDeleted: Message!
+  
   onlineUpdated: [User!]!
   shoutUpdated: Shout!
   userUpdated: User!

server.py

@@ -2,8 +2,4 @@ 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
+	uvicorn.run("main:app", host="0.0.0.0", port=PORT, ssl_keyfile="discours.key", ssl_certfile="discours.crt", reload=True)

settings.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 
-PORT = 24579
+PORT = 8081
 
 SQLITE_URI = Path(__file__).parent / "database.sqlite3"
 JWT_ALGORITHM = "HS256"