I don't understand the conflicts so I'm leaving this as is. I don't think they are issues.
« Back to merge proposal
I don't understand the conflicts so I'm leaving this as is. I don't think they are issues.