solve last conflicts

paritytech · Nov 14, 2024 · fb9c69e · fb9c69e
1 parent ff6f2f4
commit fb9c69e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 37 deletions.
diff --git a/docker/scripts/polkadot-omni-node/build-injected.sh b/docker/scripts/polkadot-omni-node/build-injected.sh
@@ -11,4 +11,4 @@ export BINARY=polkadot-omni-node
 export ARTIFACTS_FOLDER=$1
 # export TAGS=...
 
-$PROJECT_ROOT/docker/scripts/build-injected.sh
+$PROJECT_ROOT/docker/scripts/build-injected.sh
diff --git a/substrate/frame/revive/src/benchmarking_dummy.rs b/substrate/frame/revive/src/benchmarking_dummy.rs