overtone/overtone — comment on commit 1f7257c28324de8ec8fc8617093c44ad8de071b7
File:  line 0
By rosejn:

I swear I've deal with this damn merge error 10 times, yet it keeps bringing it back when I pull. I don't know what happened to my tree to tweak it out like this. I think I might need to just checkout a fresh one...