Index: .gitattributes =================================================================== diff -u -ra870e040be56028957f5de0c5b5a0bc190c67e4e -r7c4d4db269d3331bc66496ffab99fa391ad41383 --- .gitattributes (.../.gitattributes) (revision a870e040be56028957f5de0c5b5a0bc190c67e4e) +++ .gitattributes (.../.gitattributes) (revision 7c4d4db269d3331bc66496ffab99fa391ad41383) @@ -1,6 +1,3 @@ *.rxtst merge=rx-tree-merge *.rxrep merge=rx-tree-merge -*.rximg merge=rx-img-merge -*.csproj merge=rx-tree-merge -*.cs merge=rx-tree-merge -*.vb merge=rx-tree-merge +*.rximg merge=rx-img-merge \ No newline at end of file