aiolabs/lightning-pub
2
0
Fork 0
Code Issues 9 Pull requests 4 Projects Releases Packages Wiki Activity Actions

Merge pull request #129 from shocknet/faulty-yarn-lock

Browse source 
remove leftover merge conflict
This commit is contained in:
Daniel Lugo 2020-07-31 09:04:26 -04:00 • committed by GitHub
commit bb7fbae2dc
1 changed files with 0 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
yarn.lock
View file

@ -2971,15 +2971,9 @@ grpc@^1.21.1:
node-pre-gyp "^0.13.0" node-pre-gyp "^0.13.0"
protobufjs "^5.0.3" protobufjs "^5.0.3"
<<<<<<< HEAD
"gun@git://github.com/amark/gun#3e678b8568a4a8a825b84b26759d4dd4f3b0988e":
version "0.2020.520"
resolved "git://github.com/amark/gun#3e678b8568a4a8a825b84b26759d4dd4f3b0988e"
=======
"gun@git://github.com/amark/gun#97aa976c97e6219a9f93095d32c220dcd371ca62": "gun@git://github.com/amark/gun#97aa976c97e6219a9f93095d32c220dcd371ca62":
version "0.2020.520" version "0.2020.520"
resolved "git://github.com/amark/gun#97aa976c97e6219a9f93095d32c220dcd371ca62" resolved "git://github.com/amark/gun#97aa976c97e6219a9f93095d32c220dcd371ca62"
>>>>>>> master
dependencies: dependencies:
ws "^7.2.1" ws "^7.2.1"
optionalDependencies: optionalDependencies: