merge: fixed merge conflicts
This commit is contained in:
commit
90f43e74ba
101 changed files with 2156 additions and 1470 deletions
1
package-lock.json
generated
1
package-lock.json
generated
|
@ -100,6 +100,7 @@
|
|||
"name": "dwengo-1-frontend",
|
||||
"version": "0.1.1",
|
||||
"dependencies": {
|
||||
"@dwengo-1/common": "^0.1.1",
|
||||
"@tanstack/react-query": "^5.69.0",
|
||||
"@tanstack/vue-query": "^5.69.0",
|
||||
"axios": "^1.8.2",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue