Projects >> Fap-Module >>bd5aeb9d390c1ecdcde6cdd03a0fff5f95a71fde

Chunk
Conflicting content
		
        WSUtils.configureSecurityHeaders(comunicacionesServices, propertyPlaceholder, headers);
        PlatinoProxy.setProxy(comunicacionesServices, propertyPlaceholder);
<<<<<<< HEAD
        this.platinoGestorDocumental = new PlatinoGestorDocumentalService(propertyPlaceholder);
=======
        
//		platinoGestorDocumental = InjectorConfig.getInjector().getInstance(PlatinoGestorDocumentalService.class);
		this.platinoGestorDocumental = new PlatinoGestorDocumentalService(propertyPlaceholder);
		
		//Se deja al proxy con el valor que tenía antes de inyectar el servicio de Comunicaciones Internas
	    FapProperties.setBoolean("fap.proxy.enable", proxyEnable);

>>>>>>> d00cb3affb6622ca61d9d38bfe4ca043c54a0e0a
	}
	
	private String getEndPoint() {
Solution content
		
        WSUtils.configureSecurityHeaders(comunicacionesServices, propertyPlaceholder, headers);
        PlatinoProxy.setProxy(comunicacionesServices, propertyPlaceholder);
        this.platinoGestorDocumental = new PlatinoGestorDocumentalService(propertyPlaceholder);
	}
	
	private String getEndPoint() {
File
ComunicacionesInternasServiceImpl.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
Method invocation