cambio en primer.txt
Merge branch 'rama-1'
Rama 2

mod primer.txt
Merge branch 'rama-1'

Conflicts:
	primer.txt
Merge remote-tracking branch 'origin/rama-2'

Conflicts:
	primer.txt
Merge branch 'master' into rama-1
c