Index: .gitattributes =================================================================== diff -u -r230cb1c7bbbc45110759fdcd60e97f32bb94af2d -rdf72bdd406f2bc5b17bb96f1a505f07f799a4e17 --- .gitattributes (.../.gitattributes) (revision 230cb1c7bbbc45110759fdcd60e97f32bb94af2d) +++ .gitattributes (.../.gitattributes) (revision df72bdd406f2bc5b17bb96f1a505f07f799a4e17) @@ -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