From f9511217ed4f13aae09ac976e00437d897ac2a5e Mon Sep 17 00:00:00 2001 From: henenq Date: Mon, 16 Dec 2019 13:00:04 +0100 Subject: [PATCH] Fix last merge conflict --- Cargo.lock | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 15919c1a..594b80c8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -887,11 +887,7 @@ 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]]