Index: .gitattributes =================================================================== diff -u -rea494173fd933415c23045139d20944febd5c5f1 -rdb0a0cb677be39c8b2c63a6f9eb19c72ea93779c --- .gitattributes (.../.gitattributes) (revision ea494173fd933415c23045139d20944febd5c5f1) +++ .gitattributes (.../.gitattributes) (revision db0a0cb677be39c8b2c63a6f9eb19c72ea93779c) @@ -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