Merge branch 'devnet-ready' into feat/polkadot-sdk-v1.16.0

opentensor · Sep 20, 2024 · 4cbbbf4 · 4cbbbf4
2 parents 001bec2 + 2069a48
commit 4cbbbf4
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -1,5 +1 @@
 cargo build --profile production --features "metadata-hash"
-<<<<<<< HEAD
-
-=======
->>>>>>> f37d9c1b (fix node dep on runtime-benchmarks)