fix conflict
[blog.git] / .gitignore
1 \.#*