Merge

71e3a361 · Bernardo Lucas Almeida Sunderhus · 0b17cae4 · 4c23eaad · 71e3a361
Commit 71e3a361 authored Sep 20, 2018 by Bernardo Lucas Almeida Sunderhus
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

index.ts src/curio/index.ts +4 -0

No files found.
--- a/src/curio/index.ts
+++ b/src/curio/index.ts
@@ -8,7 +8,11 @@ export const service: curio.Service = {
  debug: false
 }

+<<<<<<< HEAD
 export const sessionManager: curio.SessionManager = new curio.SessionManager(
+=======
+export const sessionManager = new curio.SessionManager(
+>>>>>>> 4c23eaad47262ec8cc718a072039eb2520812ae0
  service,
  curio.connection.http
 )