Merge pull request #40 from movementlabsxyz/0xmovses/merge-conflict-fix

0xmovses · web-flow · commit 4f06ec7460b8 · 2024-04-26T17:08:53.000+01:00
monza merge conflict fix
diff --git a/.gitmodules b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "protocol-units/eth-settlement/contracts/lib/openzeppelin-contracts"]
 	path = protocol-units/dispute/contracts/lib/openzeppelin-contracts
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts
+[submodule "protocol-units/eth-settlement/lib/openzeppelin-contracts"]
+	path = protocol-units/eth-settlement/lib/openzeppelin-contracts
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts
diff --git a/protocol-units/eth-settlement/lib/openzeppelin-contracts b/protocol-units/eth-settlement/lib/openzeppelin-contracts
@@ -0,0 +1 @@
+Subproject commit 4032b42694ff6599b17ffde65b2b64d7fc8a38f8
