From 5ae5bb1ca7ffda1d4c3f864625c569e6b4b8d6de Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Tue, 25 Feb 2014 09:14:17 +0100
Subject: fixed merge issues

---
 .../main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java | 1 +
 .../main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java    | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'id/server')

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);
-- 
cgit v1.2.3