msb-public
/
hippo4j
mirror of https://github.com/longtai-cn/hippo4j
1
0
Code Issues Projects Releases Wiki Activity

Merge branch 'new-fix-flaky' of github.com:akib6075/hippo4j into new-fix-flaky

Browse Source
pull/1290/head
Kazi Akib Javed 11 months ago
parent 3a4a1c727c b720f264c8
commit 7a61c85c26
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File

7
infra/common/src/test/java/cn/hippo4j/common/toolkit/JSONUtilTest.java
Unescape View File

@ -16,6 +16,7 @@
*/ */
package cn.hippo4j.common.toolkit; package cn.hippo4j.common.toolkit;
<<<<<<< HEAD:infra/common/src/test/java/cn/hippo4j/common/toolkit/JSONUtilTest.java
<<<<<<< HEAD:infra/common/src/test/java/cn/hippo4j/common/toolkit/JSONUtilTest.java <<<<<<< HEAD:infra/common/src/test/java/cn/hippo4j/common/toolkit/JSONUtilTest.java
import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.core.type.TypeReference;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
@ -93,6 +94,8 @@ public class JSONUtilTest {
} }
} }
======= =======
=======
>>>>>>> b720f264c81b2a05ab8b4b0a58f8f0282dcf0d2c:hippo4j-common/src/test/java/cn/hippo4j/common/toolkit/JSONUtilTest.java
import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.core.type.TypeReference;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
@ -163,5 +166,9 @@ public class JSONUtilTest {
} }
} }
<<<<<<< HEAD:infra/common/src/test/java/cn/hippo4j/common/toolkit/JSONUtilTest.java
>>>>>>> ed2db3f3 (potentially issue fixed):hippo4j-common/src/test/java/cn/hippo4j/common/toolkit/JSONUtilTest.java >>>>>>> ed2db3f3 (potentially issue fixed):hippo4j-common/src/test/java/cn/hippo4j/common/toolkit/JSONUtilTest.java
=======
>>>>>>> b720f264c81b2a05ab8b4b0a58f8f0282dcf0d2c:hippo4j-common/src/test/java/cn/hippo4j/common/toolkit/JSONUtilTest.java

Write Preview
Loading…
Cancel
Save