Merge with master
This commit is contained in:
parent
42040438ed
commit
01b71bf9ba
|
@ -88,11 +88,7 @@ pub fn version_data() -> Bytes {
|
||||||
u32::from_str(env!("CARGO_PKG_VERSION_PATCH")).unwrap();
|
u32::from_str(env!("CARGO_PKG_VERSION_PATCH")).unwrap();
|
||||||
s.append(&v);
|
s.append(&v);
|
||||||
s.append(&"Parity");
|
s.append(&"Parity");
|
||||||
<<<<<<< HEAD
|
|
||||||
s.append(&rustc_version());
|
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.append(&&Target::os()[0..2]);
|
||||||
s.out()
|
s.out()
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue