Index: .gitattributes =================================================================== diff -u -r9c1c7f08ab198e62c8c88715cb1091ee21091a52 -r618d047e7bfa9ed041bff53146594fc15fa5f827 --- .gitattributes (.../.gitattributes) (revision 9c1c7f08ab198e62c8c88715cb1091ee21091a52) +++ .gitattributes (.../.gitattributes) (revision 618d047e7bfa9ed041bff53146594fc15fa5f827) @@ -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