Closed Nutzzz closed 2 years ago
Sorry for the hold up. Could you resolve the conflicts and I'll get it on master?
No worries about the hold-up. Since there hasn't been any other changes, just resolve conflicts by using mine (or rather "theirs" from your point of view).
EDIT: In any event, I'm not sure how to get visibility into the conflicts since I don't have write access to this branch. EDIT 2: OK, it looks like I was able to resolve them.