From 028b088ea8877af238b065be0113c0178cdf9c4b Mon Sep 17 00:00:00 2001
From: resq-sw <engineer@resq.software>
Date: Mon, 7 Sep 2026 22:27:15 -0400
Subject: [PATCH] fix: resolve failing CI (run 33123343984)

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

diff --git a/.gitattributes b/.gitattributes
index c1965c2..1f7549b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1 @@
-.github/workflows/*.lock.yml linguist-generated=true merge=ours
\ No newline at end of file
+.github/workflows/*.lock.yml linguist-generated=true
\ No newline at end of file