Closed johnktims closed 9 years ago
To me this looks fine to merge.
Conflict resolution should be trivial, only one line difference here but no actual conflict.
Conflicts resolved.
To me this looks fine to merge.