From 3cf55226375f5e86aba9c1a6ac7fef9235f98dfb Mon Sep 17 00:00:00 2001
From: Jason Young <jyoung8607@gmail.com>
Date: Tue, 1 Nov 2022 11:20:04 -0400
Subject: [PATCH] resolve conflict?

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

diff --git a/panda b/panda
index 0ca6d9d92..997e32807 160000
--- a/panda
+++ b/panda
@@ -1 +1 @@
-Subproject commit 0ca6d9d9248f2cea4ef2292671b6980b416c3f4b
+Subproject commit 997e328074e4b356c514e8d5e6570f151465d9e8