add-edit2
add-edit2
add-edit3
Merge branch 'master' of https://github.com/andrikhrisharyadi/test-repo

Conflicts:
	src/inner-file.txt