From b847121603492f51d61d761f819bf7967c8bd92e Mon Sep 17 00:00:00 2001 From: gaojuan1 Date: Fri, 9 Jan 2026 14:43:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- projects/fangjia-script/pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/projects/fangjia-script/pom.xml b/projects/fangjia-script/pom.xml index 9c2561dbb..d02a60460 100644 --- a/projects/fangjia-script/pom.xml +++ b/projects/fangjia-script/pom.xml @@ -602,11 +602,6 @@ -<<<<<<< HEAD - - -======= ->>>>>>> 0f09380b841eb4db196b8a3ad66beb5d3d06e7f9