Archivos Ignorados
Actualziación documentos
Merge branch 'master' of github.com:Ander5800/SENA

Conflicts:
	IntegrationServices/Sofia/Integration.Sena/Integration.Sena.suo
Actualización documentosd
Merge branch 'master' of github.com:Ander5800/SENA

Conflicts:
	IntegrationServices/Helpers/ProxyCRMSena/Proxy.CRM.Sena/Proxy.CRM.Sena/bin/Debug/Proxy.CRM.Sena.dll
	IntegrationServices/Helpers/ProxyCRMSena/Proxy.CRM.Sena/Proxy.CRM.Sena/bin/Debug/Proxy.CRM.Sena.pdb
	IntegrationServices/Helpers/ProxyCRMSena/Proxy.CRM.Sena/Proxy.CRM.Sena/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	IntegrationServices/Helpers/ProxyCRMSena/Proxy.CRM.Sena/Proxy.CRM.Sena/obj/Debug/Proxy.CRM.Sena.csproj.FileListAbsolute.txt
	IntegrationServices/Helpers/ProxyCRMSena/Proxy.CRM.Sena/Proxy.CRM.Sena/obj/Debug/Proxy.CRM.Sena.dll
	IntegrationServices/Helpers/ProxyCRMSena/Proxy.CRM.Sena/Proxy.CRM.Sena/obj/Debug/Proxy.CRM.Sena.pdb
	Utils/CRMExtensions/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Actualización datos
Actualziaicón datos
Merge branch 'master' of github.com:Ander5800/SENA
Cambio archivo git.ignore
Merge branch 'master' of github.com:Ander5800/SENA

Conflicts:
	IntegrationServices/Helpers/ProxyCRMSena/Proxy.CRM.Sena/Proxy.CRM.Sena/Contexto/SenaXRM.cs
Actualización archivo
Merge branch 'master' of github.com:Ander5800/SENA

Conflicts:
	.gitignore