Merge branch 'main' into modules

pcaversaccio · Mar 13, 2024 · e4c1198 · e4c1198
2 parents 32426ea + 1e000a3
commit e4c1198
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/create-util b/lib/create-util
diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts
+6 −5		contracts/mocks/MerkleTreeMock.sol
+12 −21		contracts/utils/structs/MerkleTree.sol