diff options
| author | Thomas <> | 2022-05-13 08:59:16 +0200 |
|---|---|---|
| committer | Thomas <> | 2022-05-13 08:59:16 +0200 |
| commit | a11517f4d25f31e352a9665392ad000dff4a44c5 (patch) | |
| tree | d9bbd0b09c68b0d86bd43ae5ccb5b277fd9c3fd3 /connector/src/main/resources/properties/messages.properties | |
| parent | 9e3b78d931d220e1ed5ecbaadcb13df7cbe96e22 (diff) | |
| parent | e412bda31b304821c08d8f8c7b2473d67246dba0 (diff) | |
| download | National_eIDAS_Gateway-a11517f4d25f31e352a9665392ad000dff4a44c5.tar.gz National_eIDAS_Gateway-a11517f4d25f31e352a9665392ad000dff4a44c5.tar.bz2 National_eIDAS_Gateway-a11517f4d25f31e352a9665392ad000dff4a44c5.zip | |
Merge branch 'nightlybuild' into feature/ms_proxy_before_refactoring
# Conflicts:
# basicConfig/templates/error_message.html
# connector/src/main/resources/specific_eIDAS_connector.beans.xml
# connector/src/test/resources/config/junit_config_1_springboot.properties
# connector/src/test/resources/config/junit_config_2_springboot.properties
# connector/src/test/resources/config/templates/countrySelection.html
# modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/Constants.java
# modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/AbstractEidProcessor.java
# modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateAuthnRequestTask.java
# pom.xml
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 |