Merge branch 'master' of C:\Users\carlos\Desktop\gnm\APPGNM1 with conflicts.
validando registro