pryecto clonado
Merge remote-tracking branch 'choose_remote_name/master' into rama1
Merge remote-tracking branch 'choose_remote_name/master' into rama2
Merge remote-tracking branch 'choose_remote_name/master'
subo error