Skip to content
Commit 7c9c8a6f authored by Sergey Pepyakin's avatar Sergey Pepyakin
Browse files

Merge and fix merge conflicts 

# Conflicts:
#	node/executor/src/lib.rs
#	node/runtime/wasm/target/wasm32-unknown-unknown/release/node_runtime.compact.wasm
#	srml/contract/src/lib.rs
#	srml/contract/src/tests.rs
parents 8cc6f33c 553e78d0
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment