commit por merge
resolviendo conflictos
Merge branch 'dev'
Merge branch 'dev'
preparando merge
Merge branch 'dev' of github.com:NEWLIFEVE/Etelix_SORI
commit por merge
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
preparando merge a master
Merge branch 'dev'
Merge branch 'master' of github.com:NEWLIFEVE/Etelix_SORI
distribucion comerciaL AGREGADA, CON FALLAS