Merge branch 'main' of /~https://github.com/NXHM/blockchain-nodes-trusted

NXHM · Jun 7, 2024 · de8ff8b · de8ff8b
2 parents 417368b + 37a0b17
commit de8ff8b
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # Substrate Node Template
 
 A fresh [Substrate](https://substrate.io/) node, ready for hacking :rocket:
@@ -221,3 +222,7 @@ the correct dependencies, activate direnv `direnv allow`.
 Please follow the [Substrate Docker instructions
 here](/~https://github.com/paritytech/polkadot-sdk/blob/master/substrate/docker/README.md) to
 build the Docker container with the Substrate Node Template binary.
+=======
+# blockchain-nodes-trusted
+Following https://docs.substrate.io/tutorials/build-a-blockchain/add-trusted-nodes/ and https://docs.substrate.io/tutorials/smart-contracts/
+>>>>>>> 37a0b1719bdfed64752e6296ed76c2b536b19418