fix conflicts

OpenZeppelin · Nov 2, 2023 · 35f144c · 35f144c
1 parent 0cc9420
commit 35f144c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/tests/mocks.cairo b/src/tests/mocks.cairo
@@ -1,10 +1,10 @@
 mod accesscontrol_mocks;
-mod erc721_mocks;
-mod erc721_receiver_mocks;
 mod account_mocks;
 mod dual721_receiver_mocks;
 mod erc20_mocks;
+mod erc721_mocks;
 mod erc721_receiver;
+mod erc721_receiver_mocks;
 mod initializable_mock;
 mod non_implementing_mock;
 mod ownable_mocks;