Merged master

CurrencyCloud · Dec 17, 2024 · 75e51c9 · 75e51c9
1 parent a3b487c
commit 75e51c9
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/src/test/java/com/currencycloud/client/dirty/UpdateTest.java b/src/test/java/com/currencycloud/client/dirty/UpdateTest.java
@@ -7,7 +7,6 @@
 import com.currencycloud.client.model.Entity;
 import org.junit.Test;
 
-<<<<<<< HEAD
 import java.lang.reflect.Field;
 
 import static org.hamcrest.Matchers.equalTo;