fsprojects/ProjectScaffold — pull request #95 by forki (2014-10-14 16:23:59+00:00)
Title: Use working gitattributes

This will hopefully stop the bad merges.

text=auto merge=union

is not a good idea.