skip

aoijs · Nov 1, 2023 · fa37bce · fa37bce
1 parent 60d7ede
commit fa37bce
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/package.json b/package.json
@@ -66,8 +66,4 @@
   },
   "type": "commonjs",
   "types": "./src/index.d.ts"
-<<<<<<< HEAD
-}
-=======
-}
->>>>>>> 32be109 (fixed/readded package-lock and package)
+}