From 17e09a557b05b78e745ebce28e198c3fa60cbb4d Mon Sep 17 00:00:00 2001
From: Stan Silvert <ssilvert@redhat.com>
Date: Thu, 11 Feb 2016 15:38:58 -0500
Subject: [PATCH] Fix conflict.

---
 .../java/org/keycloak/admin/client/resource/RealmResource.java   | 1 +
 1 file changed, 1 insertion(+)

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 25d521c74e..15ca073e04 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();