caso1

caso 1
pry1caso1

Pry 1 caso 1
pry1 caso2

pry 1 caso 2
Merge branch 'pry1_caso2' into proyecto1
Merge branch 'caso1' into clte1
Merge branch 'pry1_caso1' into proyecto1
Merge branch 'proyecto1' into clte1

Conflicts:
	audita/sql/id1agaud510.sql
ajjste 510
merge
OK
Merge branch 'clte1'

Conflicts:
	audita/sql/id1agaud510.sql