Closed sumbach closed 8 years ago
Resolve conflict.
Merged conflict resolved.
Nope, it didn't.
It did... until #52 was merged, introducing a new merge conflict.
And now it's fixed again.
Cheers!
Resolve conflict.