Fix merge conflict

2022-01-03 14:17:50 -05:00
parent 449595a4b2
commit 65d3510157
1 changed files with 0 additions and 1 deletions
--- a/spring-cloud-task-samples/batch-events/src/test/java/io/spring/cloud/BatchEventsApplicationTests.java
+++ b/spring-cloud-task-samples/batch-events/src/test/java/io/spring/cloud/BatchEventsApplicationTests.java
@@ -20,7 +20,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;

-import org.assertj.core.api.BDDAssertions;
 import org.junit.jupiter.api.Tag;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;