a test with maven ,spring and spring mvc
just dev
test rebase 1
test rebase 2
to test rebase
test rebase local 1
test rebase local 2
test commit merge 1
test commit merge 2
test commit merge 3
test commit merge 4
mofify at github
test fetch
this is a branch from dev but not master!
just test commit and merge.