From f90522dfa068cdb48c66c9d3c9a4366f81db4a6e Mon Sep 17 00:00:00 2001 From: "akib6074@gmail.com" Date: Thu, 25 May 2023 11:07:51 +0600 Subject: [PATCH] resolved conflicts --- .../src/test/java/cn/hippo4j/common/toolkit/JSONUtilTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/infra/common/src/test/java/cn/hippo4j/common/toolkit/JSONUtilTest.java b/infra/common/src/test/java/cn/hippo4j/common/toolkit/JSONUtilTest.java index ce87f2c3..4a096e17 100644 --- a/infra/common/src/test/java/cn/hippo4j/common/toolkit/JSONUtilTest.java +++ b/infra/common/src/test/java/cn/hippo4j/common/toolkit/JSONUtilTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package cn.hippo4j.common.toolkit; <<<<<<< HEAD:infra/common/src/test/java/cn/hippo4j/common/toolkit/JSONUtilTest.java