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

[wxWidgets.git] / wxPython / scripts / xrced

#!/usr/bin/env python

from wx.tools.XRCed.xrced import main
main()