From: nickthetait Date: Fri, 22 Jan 2016 17:57:24 +0000 (-0700) Subject: Fix merge problem X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=1ac5c4a253082bd16e00939917b6839d0b6c8170;p=cura.git Fix merge problem --- diff --git a/Cura/gui/configWizard.py b/Cura/gui/configWizard.py index f746a937..40f99e8c 100644 --- a/Cura/gui/configWizard.py +++ b/Cura/gui/configWizard.py @@ -1138,7 +1138,7 @@ class LulzbotMachineSelectPage(InfoPage): self.GetParent().lulzbotReadyPage) def OnLulzbotTaz6Selected(self): - wx.wizard.WizardPageSimple.Chain(self, self.GetParent().LulzbotTaz6ToolheadSelectPage) + wx.wizard.WizardPageSimple.Chain(self, self.GetParent().lulzbotTaz6ToolheadPage) def OnLulzbotTazSelected(self): wx.wizard.WizardPageSimple.Chain(self, self.GetParent().lulzbotTazSelectPage)