From 01806d941accc0765b023afd400b2e18f1afd393 Mon Sep 17 00:00:00 2001
From: Ryan Eberhard <ryan.eberhard@oracle.com>
Date: Sat, 22 Dec 2018 08:34:29 -0500
Subject: [PATCH] Resolve bad merge

---
 .../src/test/java/oracle/kubernetes/operator/MainTest.java     | 3 ---
 .../oracle/kubernetes/operator/steps/ReadHealthStepTest.java   | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/operator/src/test/java/oracle/kubernetes/operator/MainTest.java b/operator/src/test/java/oracle/kubernetes/operator/MainTest.java
index 4555746dbde..744e0d99836 100644
--- a/operator/src/test/java/oracle/kubernetes/operator/MainTest.java
+++ b/operator/src/test/java/oracle/kubernetes/operator/MainTest.java
@@ -4,10 +4,7 @@
 
 package oracle.kubernetes.operator;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import io.kubernetes.client.models.V1ObjectMeta;
diff --git a/operator/src/test/java/oracle/kubernetes/operator/steps/ReadHealthStepTest.java b/operator/src/test/java/oracle/kubernetes/operator/steps/ReadHealthStepTest.java
index 21c494be720..84763c18970 100644
--- a/operator/src/test/java/oracle/kubernetes/operator/steps/ReadHealthStepTest.java
+++ b/operator/src/test/java/oracle/kubernetes/operator/steps/ReadHealthStepTest.java
@@ -20,6 +20,7 @@
 import oracle.kubernetes.operator.ProcessingConstants;
 import oracle.kubernetes.operator.http.HttpClient;
 import oracle.kubernetes.operator.steps.ReadHealthStep.ReadHealthWithHttpClientStep;
+import oracle.kubernetes.operator.work.Component;
 import oracle.kubernetes.operator.work.NextAction;
 import oracle.kubernetes.operator.work.Packet;
 import oracle.kubernetes.operator.work.Step;