From 81515a69fabb709fed7b3f40dfc24f1e8e3f5f53 Mon Sep 17 00:00:00 2001
From: jacob <jacoobes@sern.dev>
Date: Thu, 2 May 2024 17:06:14 -0500
Subject: [PATCH] fix merge

---
 packages/ioc/src/global.ts | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/packages/ioc/src/global.ts b/packages/ioc/src/global.ts
index d513a27..1f3d6d1 100644
--- 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