Skip to content

Commit 48f1479

Browse files
committed
fix: messed up merge conflict
1 parent d7ae340 commit 48f1479

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

package.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,7 @@
2626
"generate-pwa-icons": "pwa-assets-generator",
2727
"preview": "nuxt preview",
2828
"postinstall": "pnpm generate:lexicons && nuxt prepare && simple-git-hooks",
29-
<<<<<<< HEAD
30-
=======
3129
"generate:fixtures": "node scripts/generate-fixtures.ts",
32-
>>>>>>> main
3330
"generate:lexicons": "lex build --lexicons lexicons --out shared/types/lexicons --clear",
3431
"test": "vite test",
3532
"test:browser": "pnpm build:playwright && pnpm test:browser:prebuilt",

0 commit comments

Comments
 (0)