BUG-865: remove the use of ModificationType.MERGE
[controller.git] / .gitattributes
2015-09-17 Jozef BehranBUG 2298: Ask Git to normalize line endings 66/12466/4