[unomi] branch unomi-1.6.x updated: Fix merge issue

[shuber]

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

shuber pushed a commit to branch unomi-1.6.x
in repository https://gitbox.apache.org/repos/asf/unomi.git


The following commit(s) were added to refs/heads/unomi-1.6.x by this push:
     new 9180ced  Fix merge issue
9180ced is described below

commit 9180cede4ea9970e9e6ec592e5c8e61fa22fb78b
Author: Serge Huber <shu...@jahia.com>
AuthorDate: Tue Jan 25 14:00:19 2022 +0100

    Fix merge issue
---
 itests/src/test/java/org/apache/unomi/itests/ContextServletIT.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/itests/src/test/java/org/apache/unomi/itests/ContextServletIT.java 
b/itests/src/test/java/org/apache/unomi/itests/ContextServletIT.java
index 45acb10..1147b90 100644
--- a/itests/src/test/java/org/apache/unomi/itests/ContextServletIT.java
+++ b/itests/src/test/java/org/apache/unomi/itests/ContextServletIT.java
@@ -47,10 +47,7 @@ import java.net.URI;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 import static org.hamcrest.core.IsCollectionContaining.hasItem;
 import static org.junit.Assert.*;