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

[wxWidgets.git] / wxPython / scripts / img2xpm

#!/usr/bin/env python

from wx.tools.img2xpm import main
main()