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