Skip to content
Snippets Groups Projects
Unverified Commit ef246651 authored by Oliver Tale-Yazdi's avatar Oliver Tale-Yazdi
Browse files

Manually fix conflicting ? 


Signed-off-by: default avatarOliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
parent 48415ce2
Branches
No related merge requests found
Hide whitespace changes
Inline Side-by-side
substrate/bin/node-template/runtime/Cargo.toml
+ 0
− 1
View file @ ef246651
......@@ -64,7 +64,6 @@ std = [
"frame-system-benchmarking?/std",
"frame-system-rpc-runtime-api/std",
"frame-system/std",
"frame-try-runtime/std",
"frame-try-runtime?/std",
"pallet-aura/std",
"pallet-balances/std",
......
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