Index: .gitattributes =================================================================== diff -u -r2c7e114ea962946d137445914087abd134b7cf9c -r272c13a4f994bd73b8fbb7d7e0bd138fcdd0a273 --- .gitattributes (.../.gitattributes) (revision 2c7e114ea962946d137445914087abd134b7cf9c) +++ .gitattributes (.../.gitattributes) (revision 272c13a4f994bd73b8fbb7d7e0bd138fcdd0a273) @@ -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