另外一个人改变了index.jsp
第二添加
Merge branch 'dev_blog_2'
dsfdsfdsf
sdfdsfsf
sdfdsf
sdfsdf
Merge branch 'master' of git@github.com:getnut/MyBlog.git

Conflicts:
	WebRoot/index.jsp
修改额index.jsp页面
修改jquery文件和main.jsp的文件
delete the tmp file
今天ajax的登录
Merge branch 'master' of git@github.com:getnut/MyBlog.git into dev_blog_version1.0
Merge branch 'master' of git@github.com:getnut/MyBlog.git
come master!
Merge branch 'master' of git@github.com:getnut/MyBlog.git into dev_blog_version1.0
使用cookie登录