diff options
| author | Thomas <> | 2022-07-05 17:49:34 +0200 |
|---|---|---|
| committer | Thomas <> | 2022-07-05 17:49:34 +0200 |
| commit | b5766d8107d6e557921f9a694893a1284963ef16 (patch) | |
| tree | 708e695bb0c90d958ef0e3cde6008169fb683893 /ms_specific_connector/src/main/resources/properties/messages.properties | |
| parent | 154f7f2a9c8a33d3fedf341df2be62d8404ff77f (diff) | |
| parent | 48695aa01a86890990dc4e42b9d44493ec840b25 (diff) | |
| download | National_eIDAS_Gateway-b5766d8107d6e557921f9a694893a1284963ef16.tar.gz National_eIDAS_Gateway-b5766d8107d6e557921f9a694893a1284963ef16.tar.bz2 National_eIDAS_Gateway-b5766d8107d6e557921f9a694893a1284963ef16.zip | |
Merge branch 'nightlybuild' into feature/ms_proxy_service
Diffstat (limited to 'ms_specific_connector/src/main/resources/properties/messages.properties')
| -rw-r--r-- | ms_specific_connector/src/main/resources/properties/messages.properties | 3 |
1 files changed, 0 insertions, 3 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 |