Closed tagawa closed 8 years ago
@tagawa Thanks! Can you fix the merge conflicts? And then it's ready to be merged!
@MariagraziaAlastra Strange, I don't know how merge conflicts got in there. I don't know how to fix it so I'll close this, delete the repo and re-clone.
And my editor removed some extra whitespace.