fix merge

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

Showing with 0 additions and 4 deletions

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

No files found.
--- a/src/curio/index.ts
+++ b/src/curio/index.ts
@@ -8,11 +8,7 @@ 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
 )