From c63dc53202ea62f0f8d85d12395db2dd368a71e3 Mon Sep 17 00:00:00 2001
From: Burzah <116982774+Burzah@users.noreply.github.com>
Date: Fri, 28 Mar 2025 11:33:21 -0700
Subject: [PATCH] revert accidental change (#28829)

---
 .gitattributes | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index 07507f1b668..3bb0f8b6071 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,6 @@
 ## Merge hooks, run tools/hooks/install.bat or install.sh to set up
 *.dmm text eol=lf merge=dmm
 *.dmi binary merge=dmi
-
+## TGUI bundle merge drivers
+*.bundle.* binary merge=tgui-merge-bundle
+*.chunk.* binary merge=tgui-merge-bundle