github-mirrors/librespot
1
0
Fork 0
mirror of https://github.com/librespot-org/librespot.git synced 2024-12-18 17:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix merging

Browse source
This commit is contained in:
henenq 2019-12-16 12:57:45 +01:00
commit 50ab5af557
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Cargo.lock generated
View file

@ -887,7 +887,11 @@ dependencies = [
"librespot-protocol 0.1.0",
"linear-map 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
<<<<<<< HEAD
"protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
=======
"protobuf 2.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
>>>>>>> a4f0fe96f8e8c37a16b86d6c9ca22eaebf883462
]
[[package]]