Skip to content

Commit

Permalink
Removed .gitattributes union merge from #1246.
Browse files Browse the repository at this point in the history
This did not solve the issues with web PRs and is not behaving as expected for local merges with git.exe.
  • Loading branch information
mikebattista committed Oct 11, 2022
1 parent 1e85ffd commit 97fc2e5
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
RecompiledIdlHeaders.zip filter=lfs diff=lfs merge=lfs -text
Windows.Win32.winmd filter=lfs diff=lfs merge=lfs -text
ChangesSinceLastRelease.txt merge=union

0 comments on commit 97fc2e5

Please sign in to comment.