test git
add base
add base
test:+1
add plugin
delete each
format:js文件格式化
resolve:conflict
add anim
add anim
conflict restore
Merge pull request #13 from xudafeng/master

Auto merge by kpm server