aboutsummaryrefslogtreecommitdiff
path: root/connector/src/main/resources/properties/messages.properties
diff options
context:
space:
mode:
authorThomas <>2022-07-01 14:27:19 +0200
committerThomas <>2022-07-01 14:27:19 +0200
commit847e3f5b52a7adc6baa463258087e562049ee89b (patch)
tree30dc56bfb67410d2a2cfb6621fdf8bf19be266c8 /connector/src/main/resources/properties/messages.properties
parente0e2f3b5bd3f075cd74825d49c81152c75bc6430 (diff)
downloadNational_eIDAS_Gateway-847e3f5b52a7adc6baa463258087e562049ee89b.tar.gz
National_eIDAS_Gateway-847e3f5b52a7adc6baa463258087e562049ee89b.tar.bz2
National_eIDAS_Gateway-847e3f5b52a7adc6baa463258087e562049ee89b.zip
feat(matching): add configuration property to disable 'matching-by-address-search'
Diffstat (limited to 'connector/src/main/resources/properties/messages.properties')
-rw-r--r--connector/src/main/resources/properties/messages.properties3
1 files changed, 0 insertions, 3 deletions
diff --git a/connector/src/main/resources/properties/messages.properties b/connector/src/main/resources/properties/messages.properties
index a2aaf95d..cc60cd6e 100644
--- a/connector/src/main/resources/properties/messages.properties
+++ b/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