theseer/phpdox-website — pull request #7 by okonomi (2014-09-27 09:23:06+00:00)
Title: fixed conflict marker

I found conflict marker.
I removed it.