try again ...
cant ignore
啊啊啊
controller
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/bean/dao/MyEclipseClass.java