Signed-off-by: Shawn Hou <ShawnH@shawnh1.ag-risk.org>
solve merging conflict
Merge branch 'master' of https://github.com/shawnht/testportal.git
Merge branch 'develop'
ncistest2 test.txt
Merge branch 'master' of https://github.com/shawnht/testportal.git
Merge branch 'develop'
delete copy copy from tracking dev
delete from local branch test2
Merge branch 'master' into develop
deleted from local