fdf
dss
Merge remote-tracking branch 'origin/brdes_Arquitectura' into BranchArquitectura

Conflicts:
	Arquitectura/Nuevo Documento de texto.txt
ds
asd
rt
Merge remote-tracking branch 'origin/brdes_Arquitectura' into BranchArquitectura

Conflicts:
	Diseño/Nuevo Documento de texto.txt
s
adfds
gg
Merge branch 'brdes_Arquitectura' into BranchArquitectura

Conflicts:
	Verificacion/Nuevo Documento de texto.txt
gdgsd
hfh
df
Merge remote-tracking branch 'origin/brdes_Arquitectura' into BranchArquitectura

Conflicts:
	Diseño/Nuevo Documento de texto.txt