From: nickthetait <tait@alephobjects.com>
Date: Mon, 11 Jan 2016 20:09:12 +0000 (-0700)
Subject: Fix a few merge mistakes
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=6e6b38e45ded71345a04bbf3827226b7637231d8;p=cura.git

Fix a few merge mistakes
---

diff --git a/Cura/gui/configWizard.py b/Cura/gui/configWizard.py
index 9a6b1a73..ea1e16da 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().lulzbotTaz6SelectPage)
+		wx.wizard.WizardPageSimple.Chain(self, self.GetParent().LulzbotTaz6ToolheadSelectPage)
 
 	def OnLulzbotTazSelected(self):
 		wx.wizard.WizardPageSimple.Chain(self, self.GetParent().lulzbotTazSelectPage)
@@ -1537,14 +1537,13 @@ class LulzbotChangeToolheadWizard(wx.wizard.Wizard):
 		self.lulzbotTaz5NozzleSelectPage = LulzbotTaz5NozzleSelectPage(self)
 		self.lulzbotTazBedSelectPage = LulzbotTazBedSelectPage(self)
 		self.lulzbotTazSelectPage = LulzbotTazSelectPage(self)
-		self.lulzbotTaz6SelectPage = LulzbotTaz6SelectPage(self)
 
 		wx.wizard.WizardPageSimple.Chain(self.lulzbotMiniToolheadPage, self.lulzbotReadyPage)
 		wx.wizard.WizardPageSimple.Chain(self.lulzbotTazHotendPage, self.lulzbotTazToolheadPage)
 
 		if profile.getMachineSetting('machine_type').startswith('lulzbot_mini'):
 			self.RunWizard(self.lulzbotMiniToolheadPage)
-		elif profile.getMachineSetting('machine_type').startswith('lulzbot_TAZ_5') or /
+		elif profile.getMachineSetting('machine_type').startswith('lulzbot_TAZ_5') or \
                      profile.getMachineSetting('machine_type').startswith('lulzbot_TAZ_4'):
 			self.RunWizard(self.lulzbotTazHotendPage)
 		elif profile.getMachineSetting('machine_type').startswith('lulzbot_TAZ_6'):
@@ -1607,7 +1606,6 @@ class ConfigWizard(wx.wizard.Wizard):
 		self.lulzbotMachineSelectPage = LulzbotMachineSelectPage(self)
 		self.lulzbotTazBedSelectPage = LulzbotTazBedSelectPage(self)
 		self.lulzbotTazSelectPage = LulzbotTazSelectPage(self)
-		self.lulzbotTaz6SelectPage = LulzbotTaz6SelectPage(self)
 		self.lulzbotTaz6ToolheadPage = LulzbotTaz6ToolheadSelectPage(self)
 
 		wx.wizard.WizardPageSimple.Chain(self.lulzbotMachineSelectPage, self.lulzbotMiniToolheadPage)