Update test-merge.txt
Merge pull request #2 from WineLandSoft/nueva-rama-de-edicion

Update test-merge.txt