chiark / gitweb /
Fix merge problem
authornickthetait <tait@alephobjects.com>
Fri, 22 Jan 2016 17:57:24 +0000 (10:57 -0700)
committernickthetait <tait@alephobjects.com>
Tue, 26 Jan 2016 21:45:34 +0000 (14:45 -0700)
commit1ac5c4a253082bd16e00939917b6839d0b6c8170
tree98a0b886c22a1c10ff85c28abc312444871778f1
parent356c41f487392b04426908a45ebda9152d037cd4
Fix merge problem
Cura/gui/configWizard.py