docs: update diagram to be shown properly (#20454)

(cherry picked from commit 8e9e3aa) # Conflicts: # docs/docs/learn/beginner/01-tx-lifecycle.md
cosmos · May 27, 2024 · 73a5258 · 73a5258
1 parent b99ca2c
commit 73a5258
Showing 1 changed file with 42 additions and 0 deletions.
diff --git a/docs/docs/learn/beginner/01-tx-lifecycle.md b/docs/docs/learn/beginner/01-tx-lifecycle.md
@@ -164,6 +164,7 @@ As mentioned throughout the documentation `BeginBlock`, `ExecuteTx` and `EndBloc
 Although every full-node operates individually and locally, the outcome is always consistent and unequivocal. This is because the state changes brought about by the messages are predictable, and the transactions are specifically sequenced in the proposed block.
 
 ```text
+<<<<<<< HEAD:docs/docs/learn/beginner/01-tx-lifecycle.md
 		-----------------------
 		|Receive Block Proposal|
 		-----------------------
@@ -203,6 +204,47 @@ Although every full-node operates individually and locally, the outcome is alway
 		-----------------------
 		| Commit	      |
 		-----------------------
+=======
+        --------------------------
+        | Receive Block Proposal |
+        --------------------------
+                    |
+                    v
+        -------------------------
+        |     FinalizeBlock      |
+        -------------------------
+                    |
+                    v
+            -------------------
+            |   BeginBlock     | 
+            -------------------
+                    |
+                    v
+            --------------------
+            | ExecuteTx(tx0)   |
+            | ExecuteTx(tx1)   |
+            | ExecuteTx(tx2)   |
+            | ExecuteTx(tx3)   |
+            |       .          |
+            |       .          |
+            |       .          |
+            -------------------
+                    |
+                    v
+            --------------------
+            |    EndBlock      |
+            --------------------
+                    |
+                    v
+        -------------------------
+        |       Consensus        |
+        -------------------------
+                    |
+                    v
+        -------------------------
+        |         Commit         |
+        -------------------------
+>>>>>>> 8e9e3aaf6 (docs: update diagram to be shown properly (#20454)):docs/learn/beginner/01-tx-lifecycle.md
 ```
 
 ### Transaction Execution