|
@@ -887,11 +887,7 @@ dependencies = [
|
|
|
"librespot-protocol 0.1.0",
|
|
"librespot-protocol 0.1.0",
|
|
|
"linear-map 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"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)",
|
|
"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.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]]
|
|
[[package]]
|
henenq