From fa319ff64cbe432864c1f60b0dd4c3214fa3b0d8 Mon Sep 17 00:00:00 2001
From: Gav Wood <gavin@ethcore.io>
Date: Thu, 15 Dec 2016 18:24:18 +0100
Subject: [PATCH] Remove duplicate line.

---
 Cargo.lock | 6 +++---
 Cargo.toml | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 83b7e78dc..7ad67559f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1329,7 +1329,6 @@ dependencies = [
 ]
 
 [[package]]
-<<<<<<< HEAD
 name = "parity-hash-fetch"
 version = "1.5.0"
 dependencies = [
@@ -1339,7 +1338,9 @@ dependencies = [
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "mime_guess 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
+]
+
+[[package]]
 name = "parity-rpc-client"
 version = "1.4.0"
 dependencies = [
@@ -1357,7 +1358,6 @@ dependencies = [
  "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "ws 0.5.3 (git+https://github.com/ethcore/ws-rs.git?branch=mio-upstream-stable)",
->>>>>>> origin/master
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 8c621b387..632d8d2a7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -47,7 +47,6 @@ ethcore-ipc-hypervisor = { path = "ipc/hypervisor" }
 ethcore-logger = { path = "logger" }
 ethcore-stratum = { path = "stratum" }
 ethcore-dapps = { path = "dapps", optional = true }
-clippy = { version = "0.0.103", optional = true}
 rpc-cli = { path = "rpc_cli" }
 parity-rpc-client = { path = "rpc_client" }
 ethcore-light = { path = "ethcore/light" }