From 01b71bf9ba26c5f8e09280e4f700e47e6c3e12ce Mon Sep 17 00:00:00 2001
From: arkpar <arkady.paronyan@gmail.com>
Date: Tue, 22 Mar 2016 22:09:44 +0100
Subject: [PATCH] Merge with master

---
 util/src/misc.rs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/util/src/misc.rs b/util/src/misc.rs
index 34fc84df5..190cb4130 100644
--- a/util/src/misc.rs
+++ b/util/src/misc.rs
@@ -88,11 +88,7 @@ pub fn version_data() -> Bytes {
 		u32::from_str(env!("CARGO_PKG_VERSION_PATCH")).unwrap();
 	s.append(&v);
 	s.append(&"Parity");
-<<<<<<< HEAD
 	s.append(&rustc_version());
-=======
-	s.append(&format!("{}", rustc_version()));
->>>>>>> b1793fc... Prettier version wo git dir; Use rustc compile time version
 	s.append(&&Target::os()[0..2]);
 	s.out()
 }