Merge "file 1 change for test"
[test.git] / file2.txt
1 Second file
2 With a new line