cambio (palabra que no recuerdo)
cambio
delete
Borrar todo
Recuperando
Merge remote-tracking branch 'origin/Ruta_uno'

Conflicts:
	ModulosSorceTree/ModulosSorceTree.v12.suo
	ModulosSorceTree/ModulosSorceTree/bin/Debug/ModulosSorceTree.exe
	ModulosSorceTree/ModulosSorceTree/bin/Debug/ModulosSorceTree.pdb
	ModulosSorceTree/ModulosSorceTree/bin/Debug/ModulosSorceTree.vshost.exe
	ModulosSorceTree/ModulosSorceTree/obj/Debug/DesignTimeResolveAssemblyReferences.cache
	ModulosSorceTree/ModulosSorceTree/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	ModulosSorceTree/ModulosSorceTree/obj/Debug/ModulosSorceTree.csproj.GenerateResource.Cache
	ModulosSorceTree/ModulosSorceTree/obj/Debug/ModulosSorceTree.csprojResolveAssemblyReference.cache
	ModulosSorceTree/ModulosSorceTree/obj/Debug/ModulosSorceTree.exe
	ModulosSorceTree/ModulosSorceTree/obj/Debug/ModulosSorceTree.pdb