Merge branch 'master' of https://gitea.proxnet.dev/zombieb/undead-logging

deno.json

@@ -3,16 +3,22 @@
     "test-conversion": "deno run -A tests/convert.ts",
     "test-global": "deno run -A tests/global.ts",
     "test-timing": "deno run -A tests/timing.ts",
+    "test-basic": "deno run -A tests/basic.ts",
     "bench": "deno bench -A"
   },
   "imports": {
     "@neabyte/deno-ansi": "jsr:@neabyte/deno-ansi@^0.1.0"
   },
+<<<<<<< HEAD
   "exports": {
     ".": "./src/mod.ts",
     "./types": "./src/types.ts"
   },
   "version": "1.6.0",
+=======
+  "exports": "./mod.ts",
+  "version": "1.5.1",
+>>>>>>> 8073e044a7e840abdfc8c779abf2ac240b6dc4c1
   "name": "@proxnet/undead-logging",
   "license": "MIT"
 }