test.txt
test.txt in master
Merge remote-tracking branch 'origin/master'
Merge branch 'devel'
merge from origin/master and devel