Prettier version wo git dir; Use rustc compile time version

2016-03-17 18:41:55 +01:00 · 2016-03-17 18:41:55 +01:00 · 60f2aadb8e
parent c143b1b783
commit 60f2aadb8e
1 changed files with 4 additions and 0 deletions
--- 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()
 }