Merge branch 'master' of /home/grails/aplicaciones/git-hub/yachay with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
registro de proyectos