Github user cwanda commented on the issue:
https://github.com/apache/incubator-mynewt-site/pull/164
It looks like the reason it doesn't show as merged is because there were
conflicts which I have fixed. So I believe you will need to merge the 2nd
commit that resolves the conflicts. Sorry for the inconvenience.
I am not sure why there were conflicts. I think what might have happen is
that I committed my original changes but then made some edits and amended my
commit. I thought I had amended my commit before I pushed up to the repo.
Still not sure why this would cause conflicts since the amended commit was done
before the merge.
I hope this fixes the problem.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
