Skip to content

Commit 2a747a3

Browse files
committed
chore: Clean up .gitattributes by removing fork-specific merge settings
1 parent e70aa5f commit 2a747a3

1 file changed

Lines changed: 0 additions & 6 deletions

File tree

.gitattributes

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,2 @@
11
package/src/main/scripts/console.bat eol=crlf
22
package/src/main/scripts/server.bat eol=crlf
3-
4-
# Fork-specific paths - automatically prefer our version during upstream sync
5-
# See ./sync-upstream.sh for sync workflow
6-
/README.md merge=ours
7-
.github/workflows/** merge=ours
8-
bindings/python/** merge=ours

0 commit comments

Comments
 (0)