otra modificacion
rfrf
Merge branch 'master' of
https://github.com/formatic-practicas/pruebasJava.git

Conflicts:
	README.md
Merge branch 'master' of https://github.com/formatic-practicas/pruebasJava.git
kljnj
Merge branch 'master' of https://github.com/formatic-practicas/pruebasJava.git
Merge branch 'master' of https://github.com/formatic-practicas/pruebasJava.git
Merge branch 'master' of https://github.com/formatic-practicas/pruebasJava.git
Otro commit
f
Merge branch 'master' of
https://github.com/formatic-practicas/pruebasJava.git

Conflicts:
	README.md
Merge branch 'master' of https://github.com/formatic-practicas/pruebasJava.git
guardo esto
Merge branch 'master' of
https://github.com/formatic-practicas/pruebasJava.git

Conflicts:
	README.md