Skip to content

Commit 1bfc722

Browse files
committed
Resolve Copier package conflicts
Signed-off-by: Tim Paine <3105306+timkpaine@users.noreply.github.com>
1 parent d741dc1 commit 1bfc722

2 files changed

Lines changed: 26 additions & 41 deletions

File tree

‎package.json‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -40,36 +40,21 @@
4040
"test:e2e:update": "playwright test --update-snapshots"
4141
},
4242
"peerDependencies": {
43-
<<<<<<< before updating
44-
"@awesome.me/webawesome": "^3.13.0",
45-
=======
4643
"@awesome.me/webawesome": "^3.14.0",
47-
>>>>>>> after updating
4844
"lit": "^3.3.3"
4945
},
5046
"devDependencies": {
51-
"@awesome.me/webawesome": "^3.13.0",
5247
"@axe-core/playwright": "^4.13.0",
5348
"@playwright/test": "^1.63.0",
54-
<<<<<<< before updating
55-
"@types/node": "^26.6.2",
56-
"jsdom": "^30.1.1",
57-
"lit": "^3.3.3",
58-
=======
5949
"@awesome.me/webawesome": "^3.14.0",
6050
"lit": "^3.3.3",
6151
"@types/node": "^26.6.3",
6252
"jsdom": "^30.1.1",
63-
>>>>>>> after updating
6453
"oxfmt": "^0.70.0",
6554
"oxlint": "^1.85.0",
6655
"publint": "^0.3.24",
6756
"typescript": "^7.0.2",
68-
<<<<<<< before updating
69-
"vite": "^8.3.0",
70-
=======
7157
"vite": "^8.3.1",
72-
>>>>>>> after updating
7358
"vitest": "^5.0.1"
7459
}
7560
}

‎pnpm-lock.yaml‎

Lines changed: 26 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)