From 6ef022758eb54b956a45a1da365675d2ebf9a489 Mon Sep 17 00:00:00 2001
From: Jason Wen <haibin.wen3@gmail.com>
Date: Thu, 25 May 2023 12:42:33 -0400
Subject: [PATCH] fix upstream conflict

---
 panda | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/panda b/panda
index c255ce40f1..dea4c56a11 160000
--- a/panda
+++ b/panda
@@ -1 +1 @@
-Subproject commit c255ce40f1aa48ed75bc48429cd85f1a30f96bed
+Subproject commit dea4c56a1169907fefa226f11f29b403c34f6b61