Merge pull request #113 from 0xPolygonHermez/fix/rebase

remove rebase comment
0xPolygonHermez · Aug 5, 2022 · 69889d5 · 69889d5
2 parents dc5623a + e1d4aae
commit 69889d5
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/main/utils.zkasm b/main/utils.zkasm
@@ -621,19 +621,11 @@ stackOverflow:
     ${eventLog(onError, overflow)}
                     :JMP(handleError)
 invalidDeploy:
-<<<<<<< HEAD
-    ${eventLog(onError, invalid)}
-                    :JMP(handleError)    
-invalidStaticTx:
-    ${eventLog(onError, invalid)}
-                    :JMP(handleInvalidStatic)           
-=======
 ${eventLog(onError, invalid)}
                     :JMP(handleError)
 invalidStaticTx:
 ${eventLog(onError, invalid)}
                     :JMP(handleInvalidStatic)
->>>>>>> review changes
 handleError:
     ;revert all state changes
     ;initSR --> balance = balance - gas, nonce + 1