From e8623ea98ff82b80a701928f6aed942acc46b3cd Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Wed, 9 Mar 2022 18:42:07 +0100
Subject: chore(core): fix some more problems after project refactoring

---
 connector/src/main/resources/specific_eIDAS_connector.beans.xml | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'connector')

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"
-- 
cgit v1.2.3