SOF-7315: merge main and resolve conflicts

Exabyte-io · Mar 29, 2024 · 6c36348 · 6c36348
2 parents aa77cdb + fe858ab
commit 6c36348
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -45,7 +45,7 @@
     },
     "devDependencies": {
         "@exabyte-io/eslint-config": "^2022.11.17-0",
-        "@exabyte-io/application-flavors.js": "https://github.com/Exabyte-io/application-flavors.git#b18e7e571491fe372db70e06ec95b8e21503cbe1",
+        "@exabyte-io/application-flavors.js": "https://github.com/Exabyte-io/application-flavors.git#d4d07dec422f62e30df70c649b038c3a2ab3e21e",
         "@mat3ra/code": "2024.3.25-3",
         "@mat3ra/made": "2024.3.26-0",
         "@mat3ra/esse": "2024.3.25-6",