diff options
| author | Thomas <> | 2022-05-12 12:23:53 +0200 |
|---|---|---|
| committer | Thomas <> | 2022-05-12 12:23:53 +0200 |
| commit | cbcc63885156c0b4039d5e71f943e760faaa5d78 (patch) | |
| tree | f26bebf7071e10bf4987114c47148d9b6c4fe88c /.gitignore | |
| parent | b3f78f57ff8da8a82af57377eaabea22031582e9 (diff) | |
| parent | bcfcee7879f65fe55911b566754b860a2454583a (diff) | |
| download | National_eIDAS_Gateway-cbcc63885156c0b4039d5e71f943e760faaa5d78.tar.gz National_eIDAS_Gateway-cbcc63885156c0b4039d5e71f943e760faaa5d78.tar.bz2 National_eIDAS_Gateway-cbcc63885156c0b4039d5e71f943e760faaa5d78.zip | |
Merge branch 'feature/matching_base' into nightlybuild_matching
# Conflicts:
# modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/clients/szr/SzrClient.java
# modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateIdentityLinkTask.java
# modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/utils/EidasResponseUtils.java
# modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/SzrClientTestProduction.java
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -12,3 +12,6 @@ target .metadata *.iml notCommit +.idea +connector/ignite +ignite/ |