Fix a merge error
Fix a merge error

totalretribution/Cura,fieldOfView/Cura,fxtentacle/Cura,ad1217/Cura,bq/Ultimaker-Cura,fieldOfView/Cura,ynotstartups/Wanhao,senttech/Cura,totalretribution/Cura,markwal/Cura,hmflash/Cura,fxtentacle/Cura,ad1217/Cura,bq/Ultimaker-Cura,Curahelper/Cura,hmflash/Cura,Curahelper/Cura,ynotstartups/Wanhao,senttech/Cura,markwal/Cura