。。

Code/LF.K3.SCM.BusinessPlugin/LF.K3.SCM.AppServerPlugin/BOMTaskEditionServer.cs

@@ -12,11 +12,7 @@ using System.Text;
 
 namespace LF.K3.SCM.AppServerPlugin
 {
-<<<<<<< HEAD
     [Description("磊飞任务表保存插件，已作废")]
-=======
-    [Description("磊飞任务表保存插件")]
->>>>>>> 71993e9f1f1a6152ccc681f643bd453648debc9e
     [HotUpdate]
     public class BOMTaskEditionServer : AbstractOperationServicePlugIn
     {

Code/LF.K3.SCM.BusinessPlugin/LF.K3.SCM.BusinessPlugin/GGReplaceModel.cs

@@ -22,11 +22,7 @@ using System.Transactions;
 
 namespace LF.K3.SCM.BusinessPlugin
 {
-<<<<<<< HEAD
     [Description("打开物料替换弹出框")]   
-=======
-    [Description("打开物料替换弹出框")]
->>>>>>> 71993e9f1f1a6152ccc681f643bd453648debc9e
     [HotUpdate]
     public class GGReplaceModel : AbstractDynamicFormPlugIn
     {

Code/LF.K3.SCM.BusinessPlugin/LF.K3.SCM.BusinessPlugin/TreeColorExpress.cs

-using Kingdee.BOS.Core.DynamicForm.PlugIn;
-using Kingdee.BOS.Core.DynamicForm.PlugIn.Args;
-using Kingdee.BOS.Core.DynamicForm.PlugIn.ControlModel;
-using Kingdee.BOS.Util;
-using Kingdee.K3.Core.MFG.Utils;
-using Kingdee.K3.MFG.BusinessCommon.BillPlugIn;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-
-namespace LF.K3.SCM.BusinessPlugin
-{
-<<<<<<< HEAD
-    [Description("树形颜色标识,已作废")]
-=======
-    [Description("树形颜色标识")]
->>>>>>> 71993e9f1f1a6152ccc681f643bd453648debc9e
-    [HotUpdate]
-    public class TreeColorExpress : AbstractMFGDynamicFormPlugIn
-    {
-        public override void OnLoad(EventArgs e)
-        {
-            base.OnLoad(e);
-            long num = View.GetParam("BOMID", 0L);
-        }
-    }
-}