aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorThomas <>2022-05-13 08:59:16 +0200
committerThomas <>2022-05-13 08:59:16 +0200
commita11517f4d25f31e352a9665392ad000dff4a44c5 (patch)
treed9bbd0b09c68b0d86bd43ae5ccb5b277fd9c3fd3 /.gitignore
parent9e3b78d931d220e1ed5ecbaadcb13df7cbe96e22 (diff)
parente412bda31b304821c08d8f8c7b2473d67246dba0 (diff)
downloadNational_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 '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 9be35422..bfa6e4b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,6 @@ target
.metadata
*.iml
notCommit
+.idea
+connector/ignite
+ignite/