Closed zenkavi closed 8 years ago
please remove .DS_STORE files before merging.
I think I fixed this now. Also updated .gitignore just in case
Great job! I didn't even think of that, and it's definitely the right thing to do. Merge away, Merrill! :)
please remove .DS_STORE files before merging.