resolving conflicts in files I had forgot to commit (sorry)

[wxWidgets.git] / wxPython / scripts / helpviewer

#!/usr/bin/env python

from wx.tools.helpviewer import main
main()