fix dependency conflicts

HausDAO · Feb 14, 2024 · f0e1519 · f0e1519
1 parent a3f1570
commit f0e1519
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 11 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -4,9 +4,3 @@
 [submodule "lib/openzeppelin-foundry-upgrades"]
 	path = lib/openzeppelin-foundry-upgrades
 	url = https://github.com/OpenZeppelin/openzeppelin-foundry-upgrades
-[submodule "lib/openzeppelin-contracts-upgradeable"]
-	path = lib/openzeppelin-contracts-upgradeable
-	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
-[submodule "lib/safe-contracts"]
-	path = lib/safe-contracts
-	url = https://github.com/safe-global/safe-contracts
diff --git a/lib/openzeppelin-contracts-upgradeable b/lib/openzeppelin-contracts-upgradeable
diff --git a/lib/safe-contracts b/lib/safe-contracts
diff --git a/remappings.txt b/remappings.txt
@@ -1,5 +1,5 @@
 forge-std/=lib/forge-std/src/
 @safe-global/safe-contracts/=lib/safe-contracts/contracts
-@gnosis.pm/safe-contracts/=lib/safe-contracts/
-@openzeppelin/contracts/=lib/openzeppelin-contracts-upgradeable/lib/openzeppelin-contracts/contracts/
-@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/
+@gnosis.pm/safe-contracts/=node_modules/@gnosis.pm/safe-contracts/
+@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/
+@openzeppelin/contracts-upgradeable/=node_modules/@openzeppelin/contracts-upgradeable/