2 files changed, 0 insertions, 6 deletions
diff --git a/ms_specific_connector/src/main/resources/properties/messages.properties b/ms_specific_connector/src/main/resources/properties/messages.properties
index a2aaf95d..cc60cd6e 100644
--- a/ms_specific_connector/src/main/resources/properties/messages.properties
+++ b/ms_specific_connector/src/main/resources/properties/messages.properties
@@ -47,11 +47,8 @@ gui.countryselection.country.is=Iceland
 gui.countryselection.country.is.logo.alt=Iceland-eID
 gui.countryselection.country.it=Italy
 gui.countryselection.country.it.logo.alt=Italy-eID
-<<<<<<< HEAD
 gui.countryselection.country.li=Lichtenstein
 gui.countryselection.country.li.logo.alt=Lichtensteinische-eID
-=======
->>>>>>> 1ad67c91820de1c7f2b2541f8e39752baac197d2
 gui.countryselection.country.lt=Lithuania
 gui.countryselection.country.lt.logo.alt=Lithuania-eID
 gui.countryselection.country.lv=Latvia
diff --git a/ms_specific_connector/src/main/resources/properties/messages_de.properties b/ms_specific_connector/src/main/resources/properties/messages_de.properties
index 187b7b37..6f470ea0 100644
--- a/ms_specific_connector/src/main/resources/properties/messages_de.properties
+++ b/ms_specific_connector/src/main/resources/properties/messages_de.properties
@@ -48,11 +48,8 @@ gui.countryselection.country.is=Island
 gui.countryselection.country.is.logo.alt=Isländische-eID
 gui.countryselection.country.it=Italien
 gui.countryselection.country.it.logo.alt=Italienische-eID
-<<<<<<< HEAD
 gui.countryselection.country.li=Lichtenstein
 gui.countryselection.country.li.logo.alt=Lichtensteinische-eID
-=======
->>>>>>> 1ad67c91820de1c7f2b2541f8e39752baac197d2
 gui.countryselection.country.lt=Litauen
 gui.countryselection.country.lt.logo.alt=Litauische-eID
 gui.countryselection.country.lv=Lettland