[Insight-developers] SimpleITK -- mistakenly added files?

[David Cole]

Looking at SimpleITK 'master' :
https://github.com/SimpleITK/SimpleITK/tree/master/Code/BasicFilters/json

I presently see these 4 files:
./Code/BasicFilters/json/CurvatureAnisotropicDiffusion.json.BACKUP.61123.json
./Code/BasicFilters/json/CurvatureAnisotropicDiffusion.json.BASE.61123.json
./Code/BasicFilters/json/CurvatureAnisotropicDiffusion.json.LOCAL.61123.json
./Code/BasicFilters/json/CurvatureAnisotropicDiffusion.json.REMOTE.61123.json

I'm thinking those were accidentally added via an all-inclusive 'git add -u'
in the middle of some merge operation ... ?

They're not really supposed to be there, are they?

Thanks,
David
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.itk.org/mailman/private/insight-developers/attachments/20110622/33cb32ed/attachment.htm>