libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

Fix conflict.

Browse source
This commit is contained in:
Stan Silvert 2016-02-11 15:38:58 -05:00
parent dd9cf3be39
commit 17e09a557b
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmResource.java
View file

@ -149,6 +149,7 @@ public interface RealmResource {
@Consumes(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON)
public Response partialImport(PartialImportRepresentation rep); public Response partialImport(PartialImportRepresentation rep);
@Path("authentication") @Path("authentication")
@Consumes(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON)
AuthenticationManagementResource flows(); AuthenticationManagementResource flows();