insert 1 dev
insert 2 dev
insert 3 feature
insert 1 dev
Merge branch 'develop' of https://github.com/devgate/SpringWebService into develop
resolve
Merge branch 'develop' of https://github.com/devgate/SpringWebService into develop
insert 1 dev
insert 3 feature
Merge branch 'develop' of https://github.com/devgate/SpringWebService into feature/testFeature
Merge branch 'feature/testFeature' into develop
reset
insert 1 dev
insert 3 feature
insert 2 feature
Merge branch 'feature/testFeature' into develop
Merge commit 'efb6b9c' into develop
reset:
Merge branch 'develop' of https://github.com/devgate/SpringWebService into develop
insert 1 dev