keycloak-memoizeit

Fix conflict.

2/11/2016 6:38:58 PM

Stan Silvert

Commit: 17e09a5

Tree: e91f76c

Parents: dd9cf3b

Changes

integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmResource.java 1(+1 -0)

Details

integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmResource.java 1(+1 -0)

diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmResource.java
index 25d521c..15ca073 100644
--- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmResource.java
+++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmResource.java
@@ -149,6 +149,7 @@ public interface RealmResource {
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.APPLICATION_JSON)
     public Response partialImport(PartialImportRepresentation rep);
+    
     @Path("authentication")
     @Consumes(MediaType.APPLICATION_JSON)
     AuthenticationManagementResource flows();