Commit.

2019-12-17 16:15:36 -05:00
parent 9a027d4356 9b45ff9f38
commit 5580784454
1 changed files with 10 additions and 7 deletions
@@ -13,12 +13,12 @@
 		    -   [Locking Script](/protocol/blockchain/transaction/locking-script)
 	    -   [Block](/protocol/blockchain/block)
 		    -   [Header](/protocol/blockchain/block/block-header)
-	    -   Transactions
+		    -   Merkle Tree
-		    -   Legacy Transaction Ordering
+			    -   Merkle Root
-		    -   Canonical Transaction Ordering (CTOR)
+			    -   Partial Merkle Tree
-	    -   Merkle Tree
+		    -   Transactions
-		    -   Merkle Root
+			    -   Legacy Transaction Ordering
-		    -   Partial Merkle Tree
+			    -   Canonical Transaction Ordering (CTOR)
 	    -   [Script](/protocol/blockchain/script)
 		    -   Opcodes
 			       ...
@@ -120,4 +120,7 @@
 	   - Bips
 	   - Protocol Version
-💵
+<<<<<<< HEAD
 💵
 =======
 >>>>>>> branch 'master' of /opt/jwik/data/repository