aboutsummaryrefslogtreecommitdiff
path: root/connector/src
diff options
context:
space:
mode:
Diffstat (limited to 'connector/src')
-rw-r--r--connector/src/main/resources/specific_eIDAS_connector.beans.xml8
1 files changed, 0 insertions, 8 deletions
diff --git a/connector/src/main/resources/specific_eIDAS_connector.beans.xml b/connector/src/main/resources/specific_eIDAS_connector.beans.xml
index 7ce668ff..46cf1f5b 100644
--- a/connector/src/main/resources/specific_eIDAS_connector.beans.xml
+++ b/connector/src/main/resources/specific_eIDAS_connector.beans.xml
@@ -12,10 +12,6 @@
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd">
<import resource="specific_eIDAS_core.beans.xml"/>
-<<<<<<< HEAD
-=======
-
->>>>>>> 7bf7c3c03fd3a1efeaf3f8e3dd75922e2f5f9921
<bean id="processEngineSignalController"
class="at.asitplus.eidas.specific.connector.controller.ProcessEngineSignalController" />
@@ -62,12 +58,8 @@
class="at.asitplus.eidas.specific.connector.provider.PvpMetadataProvider" />
<bean id="PVPSubjectNameGenerator"
-<<<<<<< HEAD
- class="at.asitplus.eidas.specific.connector.builder.PvpSubjectNameGenerator" />
-=======
class="at.asitplus.eidas.specific.connector.builder.PvpSubjectNameGenerator" />
->>>>>>> 7bf7c3c03fd3a1efeaf3f8e3dd75922e2f5f9921
<!-- Tasks -->
<bean id="GenerateCountrySelectionFrameTask"