MakingSense/makingsense.github.io — pull request #44 by andresmoschini (2014-05-07 14:42:45+00:00)
Title: Remove `merge=union` in .gitattributes example

It fix #42. I am merging without approvals because it seems that we all agree on it.