diff --git a/.gitattributes b/.gitattributes index 266b038..3c10e00 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,3 @@ -Directory.Packages.props merge=union -Directory.Packages.template.props merge=upstream-wins +* text=auto +*.png binary +*.cs diff=csharp