From 39e8ce1d70b652a8041840d722512669dafab513 Mon Sep 17 00:00:00 2001
From: Shirofune-Security
 <43838376+Shirofune-Security@users.noreply.github.com>
Date: Tue, 22 Sep 2026 07:25:54 +0900
Subject: [PATCH] Resolve combined native source line-ending attributes

---
 .gitattributes | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 577ca155..d4d2d2bb 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -69,10 +69,7 @@ tests/SelectedSaclFixtureProtection.cs text eol=lf
 /scripts/WecRuntime* text eol=lf
 /tests/WecState* text eol=lf
 
-<<<<<<< HEAD
 /scripts/WecListener* text eol=lf
-=======
 # Existing-file read receipts bind identical native/worker source bytes.
 /scripts/FileAccessProbe* text eol=lf
 /tests/FileAccessProbe* text eol=lf
->>>>>>> feat/373-native-file-access-probe