grassrootseconomics
/
openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge with master

This commit is contained in:
arkpar 2016-03-22 22:09:44 +01:00
parent 42040438ed
commit 01b71bf9ba
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
util/src/misc.rs
View File

@ -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()
}