local branch added newfile.txt
Commited changes @ 2:39
Merge branch 'master' of github.com:QuinnoxTest/luceneGit into development
Conflicts removed