get rid of merge conflict
[ach-master.git] / .gitignore
1 .DS_Store