resolved conflicts

2 years ago · 57c388620e
parent ed2db3f38c
commit 57c388620e
1 changed files with 0 additions and 1 deletions
--- a/hippo4j-common/src/test/java/cn/hippo4j/common/toolkit/JSONUtilTest.java
+++ b/hippo4j-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;
 import com.fasterxml.jackson.core.type.TypeReference;