mirror/lowdefy
2
0
Fork 0
mirror of https://github.com/lowdefy/lowdefy.git synced 2025-04-06 15:30:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: Fix merge conflicts

Browse Source
This commit is contained in:
SamTolmay 2021-05-26 15:33:47 +02:00
parent 3d985efe87
commit 52c31e159a
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/servers/serverDev/package.json
View File

@ -37,17 +37,10 @@
"webpack": "webpack --config webpack.config.js"
},
"dependencies": {
<<<<<<< HEAD
"@lowdefy/graphql": "3.15.0",
"@lowdefy/node-utils": "3.15.0",
"apollo-server-express": "2.24.1",
"dotenv": "10.0.0",
=======
"@lowdefy/graphql": "3.16.1",
"@lowdefy/node-utils": "3.16.1",
"apollo-server-express": "2.21.0",
"dotenv": "8.2.0",
>>>>>>> origin/develop
"apollo-server-express": "2.24.1",
"dotenv": "10.0.0",
"express": "4.17.1",
"graphql": "15.5.0"
},