From 20b61d1761388b54ece7da894410f6ea37950685 Mon Sep 17 00:00:00 2001
From: Benedikt Schesch <b.schesch@gmail.com>
Date: Mon, 16 Sep 2024 11:07:20 -0700
Subject: [PATCH] Added latest main

---
 src/scripts/merge_tools/merging | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scripts/merge_tools/merging b/src/scripts/merge_tools/merging
index a51fc28111..b636e7c829 160000
--- a/src/scripts/merge_tools/merging
+++ b/src/scripts/merge_tools/merging
@@ -1 +1 @@
-Subproject commit a51fc28111b2ec20535722f2c2402402ad21362a
+Subproject commit b636e7c82930df750a324c20ce8f99610cc2751b