ghost
commented
8 years ago @mrthnmn, you still have merge conflicts :disappointed:
Closed mrthnmn closed 8 years ago
ghost
commented
8 years ago @mrthnmn, you still have merge conflicts :disappointed:
Resolve previous conflicts and 1 typo