[syncope] branch master updated: [SYNCOPE-1416] fix for merge

[fm...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

fmartelli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/master by this push:
     new 7055fe9  [SYNCOPE-1416] fix for merge
7055fe9 is described below

commit 7055fe9983af8a85c23aa09359b7a87877dd5e3d
Author: fmartelli <fa...@gmail.com>
AuthorDate: Fri Dec 14 16:12:53 2018 +0100

    [SYNCOPE-1416] fix for merge
---
 .../src/test/java/org/apache/syncope/fit/core/SearchITCase.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SearchITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SearchITCase.java
index 3c5156f..a49fc5e 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SearchITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SearchITCase.java
@@ -36,7 +36,7 @@ import org.apache.syncope.common.lib.request.GroupCR;
 import org.apache.syncope.common.lib.request.MembershipUR;
 import org.apache.syncope.common.lib.request.UserCR;
 import org.apache.syncope.common.lib.request.UserUR;
-import org.apache.syncope.common.lib.patch.AttrPatch;
+import org.apache.syncope.common.lib.request.AttrPatch;
 import org.apache.syncope.common.lib.to.AnyObjectTO;
 import org.apache.syncope.common.lib.to.AnyTypeTO;
 import org.apache.syncope.common.lib.to.PagedResult;