V1.1.5

Author: RlxChap2

tsconfig.json

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 {
   "compilerOptions": {
     "outDir": "./dist",
@@ -9,15 +8,3 @@
     "esModuleInterop": true
   }
 }
-=======
-{
-  "compilerOptions": {
-    "outDir": "./dist",
-    "rootDir": "./src",
-    "module": "CommonJS",
-    "target": "ESNext",
-    "strict": true,
-    "esModuleInterop": true
-  }
-}
->>>>>>> 913bfbc0c48e5bdbb30449cbd1df4b0c0c1ecd09