hola munod
nuevo rama
Merge branch 'rama01'

Conflicts:
	src/com/sblm/bean/Prueba.java
mi
nuevo rama
Merge branch 'nuevo'

Conflicts:
	src/com/sblm/bean/Prueba.java
aa
entero
xxx
yyy
Merge branch 'nuevo'