need someone with steely git-fu to resolve a minor conflict in PR #740

Ken Cunningham ken.cunningham.webuse at gmail.com
Sun Feb 25 04:26:41 UTC 2018


I have tried several times to resolve the minor conflict in this PR and I just keep messing it up. It looks super trivial, but ...

https://github.com/macports/macports-ports/pull/740

Please, if you do fix it, tell me what you did so I don't have to ask this particular silly question again.

Thanks,

Ken


More information about the macports-dev mailing list