From b01b0784cb9191a4b0da978b3ed65da4fef11ba3 Mon Sep 17 00:00:00 2001
From: ShuaJJ <Sody008@gmail.com>
Date: Fri, 24 Nov 2023 21:14:54 +0800
Subject: [PATCH] fixed merge conflicts

---
 foundry.toml  | 4 ----
 lib/forge-std | 2 +-
 lib/prb-test  | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/foundry.toml b/foundry.toml
index 5e828f2..768486d 100644
--- 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
index bdea49f..e8a047e 160000
--- a/lib/forge-std
+++ b/lib/forge-std
@@ -1 +1 @@
-Subproject commit bdea49f9bb3c58c8c35850c3bdc17eaeea756e9a
+Subproject commit e8a047e3f40f13fa37af6fe14e6e06283d9a060e
diff --git a/lib/prb-test b/lib/prb-test
index 2ece875..1e9ead2 160000
--- a/lib/prb-test
+++ b/lib/prb-test
@@ -1 +1 @@
-Subproject commit 2ece8755d9afe7d66440ef9ca19b8a9dab40164b
+Subproject commit 1e9ead2f7bfaedda3038081c16484b0d7d0b2712