Closed zeromido closed 7 years ago
Looks good except for the conflict, can you rebase please?
Thanks!
@pfn Why? Doesn't ebaf23d solve the conflict? Edit: If it doesn't, just copy this and paste it to this and mark as resolved; It's not that hard.
Conflict resolved.
Thank you.
Looks good except for the conflict, can you rebase please?
Thanks!