preparando pull
Merge branch 'dev' of github.com:NEWLIFEVE/Etelix_RENOC into dev
Merge branch 'dev' of github.com:NEWLIFEVE/Etelix_RENOC into dev
preparando merge
arreglando conflictos en la laptop