OJ/meterpreter — pull request #1 by todb-r7 (2013-10-16 14:54:57+00:00)
Title: PR #31 resolve conflict

Honestly, dealing with merge conflicts without actually merging remains a dark art. FWIW, https://github.com/OJ/meterpreter/commit/7532b2f45cdf079b396e4b5eecc5b4539b05d3b2 does not resolve.

What I did was merge master into PR #31, resolved the conflict, then pushed this branch as a result.

I believe if you merge this into OJ/doxygen_beginnings, the conflct should resolve.

You'll notice that I'm bringing over two additional files with this PR. I chased those down, and these are the results of commits e8f050d6d3790d298320c32a6bbad8404cab0187 and d33a95c, which never made iti into OJ/doxygen_beginnings for whatever reason.