Merge branch 'master' into miner-spec-refact
Conflicts: ethcore/build.rs
This commit is contained in:
commit
caec38d533
@ -30,5 +30,4 @@ fn main() {
|
||||
codegen::register(&mut registry);
|
||||
registry.expand("", &src, &dst).unwrap();
|
||||
}
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user