Add missing files to ignore on merge conflict
authorCherian Mathew <c.mathew@bgbm.org>
Fri, 9 Oct 2015 12:17:18 +0000 (14:17 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Fri, 9 Oct 2015 12:17:18 +0000 (14:17 +0200)
commit51c5b735effbb08ab57afd5c4817c6ef42ace245
tree09eab130d440937f180ce79a9d44102ad22c243a
parent9524fa3910c8335a6cbcb656f9aacaca01a3f5ca
Add missing files to ignore on merge conflict
.gitattributes