fixed merge conflicts

unit-index · Nov 24, 2023 · b01b078 · b01b078
1 parent ee1ed2b
commit b01b078
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/foundry.toml b/foundry.toml
@@ -16,11 +16,7 @@
   solc = "/opt/homebrew/bin/solc"
   src = "src"
   test = "test"
-<<<<<<< HEAD
-
-=======
   fs_permissions = [{ access = "read", path = "./"}]
->>>>>>> 2cc67f69b5f96b719233ac2e7764d3d3829d523c
 
 [profile.ci]
   fuzz = { runs = 10_000 }

diff --git a/lib/forge-std b/lib/forge-std
diff --git a/lib/prb-test b/lib/prb-test
+6 −48		.github/workflows/ci.yml
+1 −1		package.json
+3 −4		src/Script.sol
+5 −18		src/StdChains.sol
+15 −156		src/StdCheats.sol
+1 −16		src/StdInvariant.sol
+14 −18		src/StdJson.sol
+3 −54		src/StdStorage.sol
+2 −2		src/StdStyle.sol
+1 −1		src/StdUtils.sol
+3 −4		src/Test.sol
+239 −505		src/Vm.sol
+77 −93		test/StdAssertions.t.sol
+37 −93		test/StdChains.t.sol
+64 −167		test/StdCheats.t.sol
+10 −10		test/StdError.t.sol
+12 −27		test/StdMath.t.sol
+34 −66		test/StdStorage.t.sol
+4 −4		test/StdStyle.t.sol
+36 −66		test/StdUtils.t.sol
+0 −15		test/Vm.t.sol
+2 −2		.github/workflows/sync.yml
+0 −37		CHANGELOG.md
+2 −2		README.md
+5 −2		package.json
+1 −5		pnpm-lock.yaml
+47 −155		src/Vm.sol