make some changes
variable file changed
variable file changed and merged conflict changed
commited from centos
Merge branch 'master' of https://github.com/leacoco/Hallo-World
centos file remove
some changes made to file3
merge conflict for file3 resolved
modify merge conflict