Intento de commit con linea conflictiva añadida
Merge branch 'master' of https://github.com/Rafagf/Repo-Test

Conflicts:
	conflicto.txt