huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix merge conflict

This commit is contained in:
Andrew Stanton-Nurse 2018-08-08 09:29:09 -07:00
parent c1da83637e
commit b9f6fb97f2
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clients/ts/package-lock.json generated
View File

@ -1,9 +1,6 @@
{ {
"name": "client-ts", "name": "client-ts",
"version": "0.0.0", "version": "0.0.0",
<<<<<<< HEAD
"lockfileVersion": 1
=======
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
@ -8952,5 +8949,4 @@
} }
} }
} }
>>>>>>> release/2.1
} }