first commit
first commit
Merge branch 'master' of https://github.com/WSUQAA/TestingRepo
Merge branch 'master' of https://github.com/WSUQAA/TestingRepo
testing commit
Merge branch 'master' of https://github.com/WSUQAA/TestingRepo
more commits
Merge branch 'master' of https://github.com/WSUQAA/TestingRepo
Merge branch 'master' of https://github.com/WSUQAA/TestingRepo

Conflicts:

Updateing