diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-08-07 23:47:15 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-08-07 23:47:15 +0400 |
commit | 7d20ad6a1ba46cad209d17d144af1cffbab334fc (patch) | |
tree | 2088eb211eccc47f0e8595078383910cd77bf500 /COPYING | |
parent | 9a8e889dfce6f0263760764ac07dc439cd0c313b (diff) |
ignore conflict files
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions