mercuryworkshop-mirror/adrift
1
0
Fork 0
mirror of https://github.com/MercuryWorkshop/adrift.git synced 2025-05-13 06:10:01 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove merge conflict marker lol

Browse source
This commit is contained in:
CoolElectronics 2023-08-14 21:18:38 -04:00
parent 97dd94c1f0
commit a839d0fe51
No known key found for this signature in database
GPG key ID: F63593D168636C50
1 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
client/package.json
View file

@ -13,14 +13,9 @@
"@types/uuid": "^9.0.2", "@types/uuid": "^9.0.2",
"bare-client-custom": "file:../bare-client-custom", "bare-client-custom": "file:../bare-client-custom",
"firebase": "^10.1.0", "firebase": "^10.1.0",
<<<<<<< HEAD
"protocol": "workspace:*",
"uuid": "^9.0.0"
=======
"protocol": "workspace:*" "protocol": "workspace:*"
}, },
"devDependencies": { "devDependencies": {
"@types/node": "^20.4.10" "@types/node": "^20.4.10"
>>>>>>> e51b5d90d4d2d0eba874fc6e5f3397f66fa846e3
} }
} }