fix merge

sern-handler · May 2, 2024 · 81515a6 · 81515a6
1 parent 3923a00
commit 81515a6
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/packages/ioc/src/global.ts b/packages/ioc/src/global.ts
@@ -1,14 +1,8 @@
-<<<<<<< HEAD
-=======
-import assert from 'assert';
->>>>>>> 82054aa (sss)
 import { Container } from './container';
 
 //SIDE EFFECT: GLOBAL DI
 let containerSubject: Container;
 
-<<<<<<< HEAD
-=======
 /**
   * Don't use this unless you know what you're doing. Destroys old containerSubject if it exists and disposes everything
   * then it will swap
@@ -19,7 +13,6 @@ export async function __swap_container(c: Container) {
     }
     containerSubject = c;
 }
->>>>>>> 82054aa (sss)
 
 /**
   * Don't use this unless you know what you're doing. Destroys old containerSubject if it exists and disposes everything