diff options
| author | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2022-05-12 14:33:30 +0000 |
|---|---|---|
| committer | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2022-05-12 14:33:30 +0000 |
| commit | e412bda31b304821c08d8f8c7b2473d67246dba0 (patch) | |
| tree | 34b34b7cd306ba2e822b9635645cba8c0d4fcc41 /connector/src/main/resources/properties/messages.properties | |
| parent | b3f78f57ff8da8a82af57377eaabea22031582e9 (diff) | |
| parent | c54b0a87fe2794ce9926e750e7b52f50685ae894 (diff) | |
| download | National_eIDAS_Gateway-e412bda31b304821c08d8f8c7b2473d67246dba0.tar.gz National_eIDAS_Gateway-e412bda31b304821c08d8f8c7b2473d67246dba0.tar.bz2 National_eIDAS_Gateway-e412bda31b304821c08d8f8c7b2473d67246dba0.zip | |
Merge branch 'nightlybuild_matching' into 'nightlybuild'
eIDAS matching functionality
See merge request egiz/eidas_at_proxy!18
Diffstat (limited to 'connector/src/main/resources/properties/messages.properties')
| -rw-r--r-- | connector/src/main/resources/properties/messages.properties | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/connector/src/main/resources/properties/messages.properties b/connector/src/main/resources/properties/messages.properties index cc60cd6e..a2aaf95d 100644 --- a/connector/src/main/resources/properties/messages.properties +++ b/connector/src/main/resources/properties/messages.properties @@ -47,8 +47,11 @@ 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 |