resolve conflict

Soroosh Sarabadani · Soroosh Sarabadani · commit 62fba5c65b9f · 2020-11-19T22:34:47.000+01:00
diff --git a/spring-boot-starter/src/test/java/io/javaoperatorsdk/operator/springboot/starter/TestController.java b/spring-boot-starter/src/test/java/io/javaoperatorsdk/operator/springboot/starter/TestController.java
@@ -5,7 +5,6 @@
 import io.javaoperatorsdk.operator.api.Controller;
 import io.javaoperatorsdk.operator.api.ResourceController;
 import io.javaoperatorsdk.operator.api.UpdateControl;
-import io.javaoperatorsdk.operator.springboot.starter.model.TestResource;
 import org.springframework.stereotype.Component;
 
 @Component
