Commit 71e3a361 authored by Bernardo Lucas Almeida Sunderhus's avatar Bernardo Lucas Almeida Sunderhus

Merge

parents 0b17cae4 4c23eaad
...@@ -8,7 +8,11 @@ export const service: curio.Service = { ...@@ -8,7 +8,11 @@ export const service: curio.Service = {
debug: false debug: false
} }
<<<<<<< HEAD
export const sessionManager: curio.SessionManager = new curio.SessionManager( export const sessionManager: curio.SessionManager = new curio.SessionManager(
=======
export const sessionManager = new curio.SessionManager(
>>>>>>> 4c23eaad47262ec8cc718a072039eb2520812ae0
service, service,
curio.connection.http curio.connection.http
) )
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment