diff options
| author | Florian Reimair <florian.reimair@iaik.tugraz.at> | 2014-02-25 09:14:17 +0100 |
|---|---|---|
| committer | Florian Reimair <florian.reimair@iaik.tugraz.at> | 2014-02-25 09:20:59 +0100 |
| commit | 5ae5bb1ca7ffda1d4c3f864625c569e6b4b8d6de (patch) | |
| tree | df50db68ea7b68ff828e015142c84d0d3369d55c /id | |
| parent | f2a3b2a78eab55af0f4ad09a160d3fffcd98a187 (diff) | |
| download | moa-id-spss-5ae5bb1ca7ffda1d4c3f864625c569e6b4b8d6de.tar.gz moa-id-spss-5ae5bb1ca7ffda1d4c3f864625c569e6b4b8d6de.tar.bz2 moa-id-spss-5ae5bb1ca7ffda1d4c3f864625c569e6b4b8d6de.zip | |
fixed merge issues
Diffstat (limited to 'id')
2 files changed, 1 insertions, 2 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java index 881d3bb2a..d1de20c4d 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java @@ -352,6 +352,7 @@ public List<OAStorkAttribute> getRequestedAttributes() { public List<AttributeProviderPlugin> getStorkAPs() { return oa_auth.getOASTORK().getAttributeProviders(); +} public byte[] getBKUSelectionTemplate() { diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java index ab106e3c0..d655dc7f2 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java @@ -106,8 +106,6 @@ public class STORKConfig { }
- }
-
public SignatureCreationParameter getSignatureCreationParameter() {
return new SignatureCreationParameter(props, basedirectory);
|