Msg01 en la rama ...
Msge en la rama master ...
Merge branch 'msg01'

Conflicts:
	holamundotest/src/miPaquete/Principal.java
Merge remote-tracking branch 'originwork/maste'

Conflicts:
	holamundotest/src/miPaquete/Principal.java