# Conflicts:
#	ast/decode2.js
#	ast/decodeResult.js
#	ast/decodeResult22.js
#	ast/main.js
#	ast/main_ok.js
#	ast/px3_V1.8.7_OK.js
#	ast/yuchuli.js
#	captcha.py
#	index.html
#	js/encodepayload.js
#	main.py
#	pc.js
#	step2.js
#	test.py
#	test_url.py