chiark / gitweb /
Fix a few merge mistakes
authornickthetait <tait@alephobjects.com>
Mon, 11 Jan 2016 20:09:12 +0000 (13:09 -0700)
committernickthetait <tait@alephobjects.com>
Tue, 12 Jan 2016 14:45:11 +0000 (07:45 -0700)
commit6e6b38e45ded71345a04bbf3827226b7637231d8
treec36f94337af63fad2bd35da0bfde85aebdb4af96
parentab441216a51ba8b99c84c323c54fb63ea11909e2
Fix a few merge mistakes
Cura/gui/configWizard.py