From d6559250311fb27a2813deea9a88dbf4ba24a79d Mon Sep 17 00:00:00 2001
From: MikeHughes-BIN <mike.hughes0506@gmail.com>
Date: Mon, 15 Dec 2025 14:30:14 +0100
Subject: [PATCH] merge conflict resolve

---
 package-lock.json       |  65 ++++++++++++++++++++++++++++++++++++++++
 storage/.DS_Store       | Bin 0 -> 20484 bytes
 storage/audio/.DS_Store | Bin 0 -> 6148 bytes
 3 files changed, 65 insertions(+)
 create mode 100644 storage/.DS_Store
 create mode 100644 storage/audio/.DS_Store

diff --git a/package-lock.json b/package-lock.json
index 0b72c8b..b11cae8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -923,6 +923,22 @@
       "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-11.0.0.tgz",
       "integrity": "sha512-cM3DI+OOb89T3wO8cpPSro80Q9eKYJ7hGVXoGS3GkDPxnYSqiv+6xwpIf6XERyJ9Tdsl09hmNmY94BkgZdVekw==",
       "license": "Apache-2.0",
+<<<<<<< Updated upstream
+=======
+      "dependencies": {
+        "mitt": "^3.0.1",
+        "zod": "^3.24.1"
+      },
+      "peerDependencies": {
+        "devtools-protocol": "*"
+      }
+    },
+    "node_modules/cli-progress": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/cli-progress/-/cli-progress-3.12.0.tgz",
+      "integrity": "sha512-tRkV3HJ1ASwm19THiiLIXLO7Im7wlTuKnvkYaTkyoAPefqjNg7W7DHKUlGRxy9vxDvbyCYQkQozvptuMkGCg8A==",
+      "license": "MIT",
+>>>>>>> Stashed changes
       "dependencies": {
         "mitt": "^3.0.1",
         "zod": "^3.24.1"
@@ -989,6 +1005,55 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
+<<<<<<< Updated upstream
+=======
+    "node_modules/cliui": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/cliui/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/cliui/node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+>>>>>>> Stashed changes
     "node_modules/clone": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
diff --git a/storage/.DS_Store b/storage/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..3c42b1f68a0ddaa37bbfbc0789a66083c9569997
GIT binary patch
literal 20484
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
MT$~*L7sdGhJ!V%lBme*a

literal 0
HcmV?d00001

diff --git a/storage/audio/.DS_Store b/storage/audio/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
GIT binary patch
literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

literal 0
HcmV?d00001