Modify newFile
Modify newFile
editing newFile
commit newFile
add newfile2
Merge branch 'dev_1.2' into dev_1.0
add newFile3
Merge branch 'dev_1.1' into dev_1.0