diff --git a/SanPinPLM/相关操作/4.0-other/999.Delphi脚本记录.md b/SanPinPLM/相关操作/4.0-other/999.Delphi脚本记录.md
index 8dd87fa0..4b809e5c 100644
--- a/SanPinPLM/相关操作/4.0-other/999.Delphi脚本记录.md
+++ b/SanPinPLM/相关操作/4.0-other/999.Delphi脚本记录.md
@@ -513,11 +513,6 @@ end.
 
 当要设置自定义分隔符号，`StringList.Delimiter := '-';` 需要写在转化语句之前
 
-<<<<<<< HEAD
-
-uses MyClass,Variables,BaseUtil,CommonFunc,DataConst,CFFrm,CFSimplePropFrm,Forms,StdCtrls,Variants,SysUtils,Classes,Controls,Dialogs,
-     CHostIntf,ProductClas,DocClas,LoginClas,VirtualTrees,CEntClas,PathClas;
-=======
 ```delphi
 uses 
   MyClass, Variables, BaseUtil, CommonFunc, DataConst, CFFrm, CFSimplePropFrm,