注释掉cmd.txt
Merge branch 'master' of 192.168.0.169:slug/arduinouploader

Conflicts:
	UploadBase.cpp
我表示解决了Mac下32uf系列芯片的问题
Merge branch 'master' of github.com:slug404/ArduinoUploaderTool

Conflicts:
	UploadBase.cpp
	main.cpp