From 60f2aadb8e03cabb7d7f7668beebc6cd23d3daa9 Mon Sep 17 00:00:00 2001
From: arkpar <arkady.paronyan@gmail.com>
Date: Thu, 17 Mar 2016 18:41:55 +0100
Subject: [PATCH] Prettier version wo git dir; Use rustc compile time version

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

diff --git a/util/src/misc.rs b/util/src/misc.rs
index 190cb4130..34fc84df5 100644
--- a/util/src/misc.rs
+++ b/util/src/misc.rs
@@ -88,7 +88,11 @@ 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()
 }