chore: resolve conflicts

2025-02-14 09:39:44 -06:00 · 2025-02-14 09:39:44 -06:00 · 3abf1c506d
parent cd3ad9e0a1 f7acce87c4
commit 3abf1c506d
2 changed files with 721 additions and 266 deletions
--- a/package.json
+++ b/package.json
@ -13,6 +13,7 @@
    "eslint": "^9.18.0",
    "globals": "^15.14.0",
    "hugo-extended": ">=0.101.0",
+    "nightwatch": "^3.11.0",
    "postcss": ">=8.4.31",
    "postcss-cli": ">=9.1.0",
    "prettier": "^3.2.5",
--- a/yarn.lock
+++ b/yarn.lock