Skip to content

S
siscon-cli
Commit a3a8db01 authored by Bernardo Lucas Almeida Sunderhus's avatar Bernardo Lucas Almeida Sunderhus
Browse files
Options

fix merge

parent 71e3a361
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
src/curio/index.ts
View file @ a3a8db01
...@@ -8,11 +8,7 @@ export const service: curio.Service = { ...@@ -8,11 +8,7 @@ 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