03640: Merge dev and fix conflicts

hashgraph · Jul 3, 2023 · bfb6150 · bfb6150
1 parent de3d67a
commit bfb6150
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.../src/test/java/com/hedera/node/app/service/mono/state/submerkle/EvmFnResultSerdeTest.java b/.../src/test/java/com/hedera/node/app/service/mono/state/submerkle/EvmFnResultSerdeTest.java
@@ -19,8 +19,8 @@
 import com.hedera.test.serde.EqualityType;
 import com.hedera.test.serde.SelfSerializableDataTest;
 import com.hedera.test.utils.SeededPropertySource;
-import java.util.Collections;
 import edu.umd.cs.findbugs.annotations.NonNull;
+import java.util.Collections;
 
 public class EvmFnResultSerdeTest extends SelfSerializableDataTest<EvmFnResult> {
     public static final int NUM_TEST_CASES = 2 * MIN_TEST_CASES_PER_VERSION;