Rebase and fix conflicts

elastic · Aug 2, 2018 · 645abfb · 645abfb
1 parent 6f20c96
commit 645abfb
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/x-pack/plugin/rollup/src/test/java/org/elasticsearch/xpack/rollup/config/ConfigTests.java b/x-pack/plugin/rollup/src/test/java/org/elasticsearch/xpack/rollup/config/ConfigTests.java
@@ -16,7 +16,6 @@
 import org.elasticsearch.xpack.core.rollup.job.TermsGroupConfig;
 import org.joda.time.DateTimeZone;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;