ignore conflict files
authorCampbell Barton <ideasman42@gmail.com>
Thu, 7 Aug 2014 19:47:15 +0000 (05:47 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 7 Aug 2014 19:47:15 +0000 (05:47 +1000)
commit7d20ad6a1ba46cad209d17d144af1cffbab334fc
tree2088eb211eccc47f0e8595078383910cd77bf500
parent9a8e889dfce6f0263760764ac07dc439cd0c313b
ignore conflict files
.gitignore