test git pull
fix the merge
Merge branch 'dev' of c:/Users/acenodie/learngit/ into dev
test the git status
just test
just test
just test
add readme.txt
add readme.txt
Merge branch 'dev' of c:/Users/acenodie/learngit/ into dev
add readme.txt