.gitattributes: a CHANGELOG conflict keeps both sides' lines

This commit is contained in:
teahubxyz authored and steward committed 2026-10-29 11:18:03 -07:00
1 parent 662e495d80
commit eaa5455ee9
1 file changed
+1
+1
View File
@@ -0,0 +1 @@
CHANGELOG.md merge=union