合并3.1.5&3.1.3.3(含价差)后，解决Dpr版本冲突

Dprs/Pro/Measure.dof

@@ -114,25 +114,8 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=1
-<<<<<<< HEAD
-Release=5
-Build=105
-=======
-<<<<<<< HEAD
-Release=5
-Build=109
-=======
 Release=3
-<<<<<<< HEAD
-Build=2041
-<<<<<<< HEAD
->>>>>>> 3.1.3.3
-=======
-=======
-Build=3011
->>>>>>> 3.1.3.3PriceMargin(Temp)
->>>>>>> 3.1.3.3
->>>>>>> 4cecad11f3edfe92005226db79eccafb29339683
+Build=3012
 Debug=0
 PreRelease=0
 Special=0
@@ -143,60 +126,4 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化专业版
-<<<<<<< HEAD
-FileVersion=3.1.5.105
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
-FileVersion=3.1.5.109
-=======
-FileVersion=3.1.3.2041
->>>>>>> 3.1.3.3
-=======
-FileVersion=3.1.3.2041
-=======
-FileVersion=3.1.3.3011
->>>>>>> 3.1.3.3PriceMargin(Temp)
->>>>>>> 3.1.3.3
->>>>>>> 4cecad11f3edfe92005226db79eccafb29339683
-InternalName=Measure
-LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
-LegalTrademarks=Measure
-OriginalFilename=
-ProductName=纵横公路工程计量决算一体化软件
-ProductVersion=3
-Comments=
-[Excluded Packages]
-C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxEditorsVCLD7.bpl=ExpressEditors Library 5 (VCL Edition) by Developer Express Inc.
-C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxExtEditorsVCLD7.bpl=ExpressExtendedEditors Library 5 (VCL Edition) by Developer Express Inc.
-[HistoryLists\hlConditionals]
-Count=10
-Item0=_mEncrypt;
-Item1=_mEncrypt;cplPrint;cplOutputToExcelRange
-Item2=cplPrint;_mEncrypt;cplPrint;cplOutputToExcelRange
-Item3=cplPrint;_mEncrypt;cplPrint
-Item4=cplPrint;_mEncrypt
-Item5=cplPrint;
-Item6=cplPrint;_mEncrypt;
-Item7=cplPrint;mEncrypt;
-Item8=cplPrint
-Item9=cplPrint;cplOutputToExcelRange;
-[HistoryLists\hlUnitAliases]
-Count=1
-Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
-[HistoryLists\hlUnitOutputDirectory]
-Count=2
-Item0=..\..\Dcus
-Item1=..\Dcus
-[HistoryLists\hlOutputDirectorry]
-Count=10
-Item0=D:\SmartCostExe\Measure
-Item1=E:\资料\软件安装文件\纵横结算决算计量一体化软件(专业版)
-Item2=E:\SmartCostExe\Measure
-Item3=D:\Program Files (x86)\纵横软件\纵横计量决算一体化软件(专业版4)
-Item4=D:\Program Files (x86)\纵横软件\纵横计量决算一体化软件(专业版)
-Item5=D:\Program Files (x86)\纵横软件\纵横计量决算一体化软件(专业版2)
-Item6=D:\Program Files (x86)\纵横软件\纵横公路工程计量支付(专业版)
-Item7=D:\Program Files\纵横软件\Environment
-Item8=..\..\Environment
-Item9=..\Dcus
+FileVersion=3.1.3.3012

Dprs/Pro/Measure.dpr

@@ -136,23 +136,9 @@ uses
   rmGcl_XmjBillsDm in '..\..\DataModules\ReportMemoryDm\rmGcl_XmjBillsDm.pas' {rmGcl_XmjBillsData: TDataModule},
   rmCustomized2Dm in '..\..\DataModules\ReportMemoryDm\rmCustomized2Dm.pas' {rmCustomized2Data: TDataModule},
   CalcDecimal in '..\..\Units\CalcDecimal.pas',
-<<<<<<< HEAD
-<<<<<<< HEAD
   BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
   DetailExcelImport in '..\..\Units\DetailExcelImport.pas',
-  mProgressProFrm in '..\..\Forms\mProgressProFrm.pas' {ProgressProForm};
-<<<<<<< HEAD
-=======
-=======
-  rmHaBaiCustomizedDm in '..\..\DataModules\ReportMemoryDm\rmHaBaiCustomizedDm.pas' {rmHaBaiCustomizedData: TDataModule},
-  BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
-  DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm};
->>>>>>> 3.1.3.3
-=======
-  rmHaBaiCustomizedDm in '..\..\DataModules\ReportMemoryDm\rmHaBaiCustomizedDm.pas' {rmHaBaiCustomizedData: TDataModule},
-  BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
-  DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm};
-=======
+  mProgressProFrm in '..\..\Forms\mProgressProFrm.pas' {ProgressProForm},
   ProjectGLDm in '..\..\DataModules\ProjectGLDm.pas' {ProjectGLData: TDataModule},
   PriceMarginBillsDm in '..\..\DataModules\PriceMarginBillsDm.pas' {PriceMarginBillsData: TDataModule},
   GclBillsGatherModel in '..\..\Units\GclBillsGatherModel.pas',
@@ -162,12 +148,8 @@ uses
   ProjectGLFme in '..\..\Frames\ProjectGLFme.pas' {ProjectGLFrame: TFrame},
   SelectDetailGLsFrm in '..\..\Forms\SelectDetailGLsFrm.pas' {SelectDetailGLsForm},
   rmHaBaiCustomizedDm in '..\..\DataModules\ReportMemoryDm\rmHaBaiCustomizedDm.pas' {rmHaBaiCustomizedData: TDataModule},
-  BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
   DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm},
   BaseClipboard in '..\..\Units\BaseClipboard.pas';
->>>>>>> 3.1.3.3PriceMargin(Temp)
->>>>>>> 3.1.3.3
->>>>>>> 4cecad11f3edfe92005226db79eccafb29339683
 
 {$R *.res}
 

Dprs/Pro/Measure_Cloud.dof

@@ -114,25 +114,8 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=1
-<<<<<<< HEAD
-Release=5
-Build=103
-=======
-<<<<<<< HEAD
-Release=5
-Build=109
-=======
 Release=3
-<<<<<<< HEAD
-Build=2041
-<<<<<<< HEAD
->>>>>>> 3.1.3.3
-=======
-=======
-Build=3011
->>>>>>> 3.1.3.3PriceMargin(Temp)
->>>>>>> 3.1.3.3
->>>>>>> 4cecad11f3edfe92005226db79eccafb29339683
+Build=3012
 Debug=0
 PreRelease=0
 Special=0
@@ -143,56 +126,4 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化云版
-<<<<<<< HEAD
-FileVersion=3.1.5.103
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
-FileVersion=3.1.5.109
-=======
-FileVersion=3.1.3.2041
->>>>>>> 3.1.3.3
-=======
-FileVersion=3.1.3.2041
-=======
-FileVersion=3.1.3.3011
->>>>>>> 3.1.3.3PriceMargin(Temp)
->>>>>>> 3.1.3.3
->>>>>>> 4cecad11f3edfe92005226db79eccafb29339683
-InternalName=Measure
-LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
-LegalTrademarks=Measure
-OriginalFilename=
-ProductName=纵横公路工程计量决算一体化软件
-ProductVersion=3
-Comments=
-[Excluded Packages]
-C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxEditorsVCLD7.bpl=ExpressEditors Library 5 (VCL Edition) by Developer Express Inc.
-C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxExtEditorsVCLD7.bpl=ExpressExtendedEditors Library 5 (VCL Edition) by Developer Express Inc.
-[HistoryLists\hlConditionals]
-Count=5
-Item0=_mCloud;_mEncrypt;
-Item1=_OnLine;_mEncrypt;
-Item2=_OnLine;_mEncrypt;cplPrint;cplOutputToExcelRange
-Item3=_OnLine;cplPrint;cplOutputToExcelRange
-Item4=_OnLine;cplPrint;_mEncrypt;cplPrint;cplOutputToExcelRange
-[HistoryLists\hlUnitAliases]
-Count=1
-Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
-[HistoryLists\hlUnitOutputDirectory]
-Count=3
-Item0=..\..\Dcus
-Item1=E:\DelphiTemp
-Item2=D:\Dcu
-[HistoryLists\hlOutputDirectorry]
-Count=4
-Item0=D:\SmartCostExe\Measure
-Item1=E:\SmartCostExe\Measure
-Item2=D:\Program Files (x86)\纵横软件\纵横计量决算一体化软件(云版)
-Item3=D:\Program Files (x86)\纵横软件\纵横计量决算一体化软件(专业版)
-[HistoryLists\hlBPLOutput]
-Count=1
-Item0=..\Bin
-[HistoryLists\hlDCPOutput]
-Count=1
-Item0=D:\Dcu
+FileVersion=3.1.3.3012

Dprs/Pro/Measure_Cloud.dpr

@@ -140,23 +140,10 @@ uses
   rmGcl_XmjBillsDm in '..\..\DataModules\ReportMemoryDm\rmGcl_XmjBillsDm.pas' {rmGcl_XmjBillsData: TDataModule},
   rmCustomized2Dm in '..\..\DataModules\ReportMemoryDm\rmCustomized2Dm.pas' {rmCustomized2Data: TDataModule},
   CalcDecimal in '..\..\Units\CalcDecimal.pas',
-<<<<<<< HEAD
-<<<<<<< HEAD
   BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
   DetailExcelImport in '..\..\Units\DetailExcelImport.pas',
-  mProgressProFrm in '..\..\Forms\mProgressProFrm.pas' {ProgressProForm};
-<<<<<<< HEAD
-=======
-=======
+  mProgressProFrm in '..\..\Forms\mProgressProFrm.pas' {ProgressProForm},
   rmHaBaiCustomizedDm in '..\..\DataModules\ReportMemoryDm\rmHaBaiCustomizedDm.pas' {rmHaBaiCustomizedData: TDataModule},
-  BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
-  DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm};
->>>>>>> 3.1.3.3
-=======
-  rmHaBaiCustomizedDm in '..\..\DataModules\ReportMemoryDm\rmHaBaiCustomizedDm.pas' {rmHaBaiCustomizedData: TDataModule},
-  BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
-  DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm};
-=======
   ProjectGLDm in '..\..\DataModules\ProjectGLDm.pas' {ProjectGLData: TDataModule},
   PriceMarginBillsDm in '..\..\DataModules\PriceMarginBillsDm.pas' {PriceMarginBillsData: TDataModule},
   GclBillsGatherModel in '..\..\Units\GclBillsGatherModel.pas',
@@ -165,13 +152,8 @@ uses
   PriceMarginFme in '..\..\Frames\PriceMarginFme.pas' {PriceMarginFrame: TFrame},
   ProjectGLFme in '..\..\Frames\ProjectGLFme.pas' {ProjectGLFrame: TFrame},
   SelectDetailGLsFrm in '..\..\Forms\SelectDetailGLsFrm.pas' {SelectDetailGLsForm},
-  rmHaBaiCustomizedDm in '..\..\DataModules\ReportMemoryDm\rmHaBaiCustomizedDm.pas' {rmHaBaiCustomizedData: TDataModule},
-  BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
   DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm},
   BaseClipboard in '..\..\Units\BaseClipboard.pas';
->>>>>>> 3.1.3.3PriceMargin(Temp)
->>>>>>> 3.1.3.3
->>>>>>> 4cecad11f3edfe92005226db79eccafb29339683
 
 {$R *.res}
 

Dprs/Pro/Measure_GuangDong.dof

@@ -114,25 +114,8 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=1
-<<<<<<< HEAD
-Release=5
-Build=102
-=======
-<<<<<<< HEAD
-Release=5
-Build=106
-=======
 Release=3
-<<<<<<< HEAD
-Build=2041
-<<<<<<< HEAD
->>>>>>> 3.1.3.3
-=======
-=======
-Build=3011
->>>>>>> 3.1.3.3PriceMargin(Temp)
->>>>>>> 3.1.3.3
->>>>>>> 4cecad11f3edfe92005226db79eccafb29339683
+Build=3013
 Debug=0
 PreRelease=0
 Special=0
@@ -143,51 +126,4 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化广东专业版
-<<<<<<< HEAD
-FileVersion=3.1.5.102
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
-FileVersion=3.1.5.106
-=======
-FileVersion=3.1.3.2041
->>>>>>> 3.1.3.3
-=======
-FileVersion=3.1.3.2041
-=======
-FileVersion=3.1.3.3011
->>>>>>> 3.1.3.3PriceMargin(Temp)
->>>>>>> 3.1.3.3
->>>>>>> 4cecad11f3edfe92005226db79eccafb29339683
-InternalName=Measure
-LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
-LegalTrademarks=Measure
-OriginalFilename=
-ProductName=纵横公路工程计量决算一体化软件
-ProductVersion=3
-Comments=
-[Excluded Packages]
-C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxEditorsVCLD7.bpl=ExpressEditors Library 5 (VCL Edition) by Developer Express Inc.
-C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxExtEditorsVCLD7.bpl=ExpressExtendedEditors Library 5 (VCL Edition) by Developer Express Inc.
-[HistoryLists\hlConditionals]
-Count=1
-Item0=_mEncrypt;_mGuangDong
-[HistoryLists\hlUnitAliases]
-Count=1
-Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
-[HistoryLists\hlUnitOutputDirectory]
-Count=3
-Item0=..\..\Dcus
-Item1=..\Dcus
-Item2=D:\Dcu
-[HistoryLists\hlOutputDirectorry]
-Count=3
-Item0=D:\SmartCostExe\Measure
-Item1=E:\SmartCostExe\Measure
-Item2=D:\Program Files (x86)\纵横软件\纵横计量决算一体化软件(广东专业版)
-[HistoryLists\hlBPLOutput]
-Count=1
-Item0=..\Bin
-[HistoryLists\hlDCPOutput]
-Count=1
-Item0=D:\Dcu
+FileVersion=3.1.3.3013

Dprs/Pro/Measure_GuangDong.dpr

@@ -136,19 +136,8 @@ uses
   rmGcl_XmjBillsDm in '..\..\DataModules\ReportMemoryDm\rmGcl_XmjBillsDm.pas' {rmGcl_XmjBillsData: TDataModule},
   rmCustomized2Dm in '..\..\DataModules\ReportMemoryDm\rmCustomized2Dm.pas' {rmCustomized2Data: TDataModule},
   CalcDecimal in '..\..\Units\CalcDecimal.pas',
-<<<<<<< HEAD
-<<<<<<< HEAD
-  BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
   DetailExcelImport in '..\..\Units\DetailExcelImport.pas',
-  mProgressProFrm in '..\..\Forms\mProgressProFrm.pas' {ProgressProForm};
-<<<<<<< HEAD
-=======
-=======
-=======
->>>>>>> 3.1.3.3
-  rmHaBaiCustomizedDm in '..\..\DataModules\ReportMemoryDm\rmHaBaiCustomizedDm.pas' {rmHaBaiCustomizedData: TDataModule},
-  BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
-=======
+  mProgressProFrm in '..\..\Forms\mProgressProFrm.pas' {ProgressProForm},
   BaseClipboard in '..\..\Units\BaseClipboard.pas',
   PriceMarginBillsDm in '..\..\DataModules\PriceMarginBillsDm.pas' {PriceMarginBillsData: TDataModule},
   ProjectGLDm in '..\..\DataModules\ProjectGLDm.pas' {ProjectGLData: TDataModule},
@@ -160,10 +149,7 @@ uses
   PriceMarginFme in '..\..\Frames\PriceMarginFme.pas' {PriceMarginFrame: TFrame},
   ProjectGLFme in '..\..\Frames\ProjectGLFme.pas' {ProjectGLFrame: TFrame},
   SelectDetailGLsFrm in '..\..\Forms\SelectDetailGLsFrm.pas' {SelectDetailGLsForm},
->>>>>>> 3.1.3.3PriceMargin(Temp)
   DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm};
->>>>>>> 3.1.3.3
->>>>>>> 4cecad11f3edfe92005226db79eccafb29339683
 
 {$R *.res}
 

Dprs/Pro/Measure_GuangDong_Cloud.dof

@@ -114,25 +114,8 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=1
-<<<<<<< HEAD
-Release=5
-Build=102
-=======
-<<<<<<< HEAD
-Release=5
-Build=106
-=======
 Release=3
-<<<<<<< HEAD
-Build=2041
-<<<<<<< HEAD
->>>>>>> 3.1.3.3
-=======
-=======
-Build=3011
->>>>>>> 3.1.3.3PriceMargin(Temp)
->>>>>>> 3.1.3.3
->>>>>>> 4cecad11f3edfe92005226db79eccafb29339683
+Build=3013
 Debug=0
 PreRelease=0
 Special=0
@@ -143,59 +126,4 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化广东云版
-<<<<<<< HEAD
-FileVersion=3.1.5.102
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
-FileVersion=3.1.5.106
-=======
-FileVersion=3.1.3.2041
->>>>>>> 3.1.3.3
-=======
-FileVersion=3.1.3.2041
-=======
-FileVersion=3.1.3.3011
->>>>>>> 3.1.3.3PriceMargin(Temp)
->>>>>>> 3.1.3.3
->>>>>>> 4cecad11f3edfe92005226db79eccafb29339683
-InternalName=Measure
-LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
-LegalTrademarks=Measure
-OriginalFilename=
-ProductName=纵横公路工程计量决算一体化软件
-ProductVersion=3
-Comments=
-[Excluded Packages]
-C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxEditorsVCLD7.bpl=ExpressEditors Library 5 (VCL Edition) by Developer Express Inc.
-C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxExtEditorsVCLD7.bpl=ExpressExtendedEditors Library 5 (VCL Edition) by Developer Express Inc.
-[HistoryLists\hlConditionals]
-Count=8
-Item0=_mCloud;_mEncrypt;_mGuangDong
-Item1=_mCloud;_mEncrypt;_mGuangDong;_Test
-Item2=_mCloud;_mEncrypt;_mGuangDong;_mTest
-Item3=_mCloud;_mEncrypt;_mGuangDong;
-Item4=_OnLine;_mEncrypt;_mGuangDong;cplPrint;cplOutputToExcelRange
-Item5=_OnLine;_mEncrypt;cplPrint;cplOutputToExcelRange
-Item6=_OnLine;cplPrint;cplOutputToExcelRange
-Item7=_OnLine;cplPrint;_mEncrypt;cplPrint;cplOutputToExcelRange
-[HistoryLists\hlUnitAliases]
-Count=1
-Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
-[HistoryLists\hlUnitOutputDirectory]
-Count=3
-Item0=..\..\Dcus
-Item1=E:\DelphiTemp
-Item2=D:\Dcu
-[HistoryLists\hlOutputDirectorry]
-Count=4
-Item0=D:\SmartCostExe\Measure
-Item1=E:\SmartCostExe\Measure
-Item2=D:\Program Files (x86)\纵横软件\纵横计量决算一体化软件(广东云版)15审核人
-Item3=D:\Program Files (x86)\纵横软件\纵横计量决算一体化软件(专业版)
-[HistoryLists\hlBPLOutput]
-Count=1
-Item0=..\Bin
-[HistoryLists\hlDCPOutput]
-Count=1
-Item0=D:\Dcu
+FileVersion=3.1.3.3013

Dprs/Pro/Measure_GuangDong_Cloud.dpr

@@ -140,34 +140,20 @@ uses
   rmGcl_XmjBillsDm in '..\..\DataModules\ReportMemoryDm\rmGcl_XmjBillsDm.pas' {rmGcl_XmjBillsData: TDataModule},
   rmCustomized2Dm in '..\..\DataModules\ReportMemoryDm\rmCustomized2Dm.pas' {rmCustomized2Data: TDataModule},
   CalcDecimal in '..\..\Units\CalcDecimal.pas',
-<<<<<<< HEAD
-<<<<<<< HEAD
   BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
   DetailExcelImport in '..\..\Units\DetailExcelImport.pas',
-  mProgressProFrm in '..\..\Forms\mProgressProFrm.pas' {ProgressProForm};
-<<<<<<< HEAD
-=======
-=======
-=======
->>>>>>> 3.1.3.3
-  rmHaBaiCustomizedDm in '..\..\DataModules\ReportMemoryDm\rmHaBaiCustomizedDm.pas' {rmHaBaiCustomizedData: TDataModule},
-  BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
-=======
+  mProgressProFrm in '..\..\Forms\mProgressProFrm.pas' {ProgressProForm},
   BaseClipboard in '..\..\Units\BaseClipboard.pas',
   PriceMarginBillsDm in '..\..\DataModules\PriceMarginBillsDm.pas' {PriceMarginBillsData: TDataModule},
   ProjectGLDm in '..\..\DataModules\ProjectGLDm.pas' {ProjectGLData: TDataModule},
   GclBillsGatherModel in '..\..\Units\GclBillsGatherModel.pas',
   DetailGLDm in '..\..\DataModules\DetailGLDm.pas' {DetailGLData: TDataModule},
   rmHaBaiCustomizedDm in '..\..\DataModules\ReportMemoryDm\rmHaBaiCustomizedDm.pas' {rmHaBaiCustomizedData: TDataModule},
-  BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
   PriceMarginBillsFme in '..\..\Frames\PriceMarginBillsFme.pas' {PriceMarginBillsFrame: TFrame},
   PriceMarginFme in '..\..\Frames\PriceMarginFme.pas' {PriceMarginFrame: TFrame},
   ProjectGLFme in '..\..\Frames\ProjectGLFme.pas' {ProjectGLFrame: TFrame},
   SelectDetailGLsFrm in '..\..\Forms\SelectDetailGLsFrm.pas' {SelectDetailGLsForm},
->>>>>>> 3.1.3.3PriceMargin(Temp)
   DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm};
->>>>>>> 3.1.3.3
->>>>>>> 4cecad11f3edfe92005226db79eccafb29339683
 
 {$R *.res}
 

Dprs/Pro/Measure_GuangDong_TZ.dof

@@ -114,25 +114,8 @@ IncludeVerInfo=1
 AutoIncBuild=0
 MajorVer=3
 MinorVer=1
-<<<<<<< HEAD
 Release=5
 Build=100
-=======
-<<<<<<< HEAD
-Release=5
-Build=105
-=======
-Release=3
-<<<<<<< HEAD
-Build=2040
-<<<<<<< HEAD
->>>>>>> 3.1.3.3
-=======
-=======
-Build=3010
->>>>>>> 3.1.3.3PriceMargin(Temp)
->>>>>>> 3.1.3.3
->>>>>>> 4cecad11f3edfe92005226db79eccafb29339683
 Debug=0
 PreRelease=0
 Special=0
@@ -141,31 +124,15 @@ DLL=0
 Locale=2052
 CodePage=936
 [Version Info Keys]
-CompanyName=珠海纵横创新软件有限公司
-<<<<<<< HEAD
+CompanyName=
 FileDescription=
-<<<<<<< HEAD
 FileVersion=3.1.5.100
-=======
-<<<<<<< HEAD
-FileVersion=3.1.5.105
-=======
-FileVersion=3.1.3.2040
->>>>>>> 3.1.3.3
->>>>>>> 4cecad11f3edfe92005226db79eccafb29339683
 InternalName=
 LegalCopyright=
 LegalTrademarks=
-=======
-FileDescription=纵横0号台账广东专业版
-FileVersion=3.1.3.3010
-InternalName=Measure
-LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
-LegalTrademarks=Measure
->>>>>>> 3.1.3.3PriceMargin(Temp)
 OriginalFilename=
-ProductName=纵横公路工程0号台账软件
-ProductVersion=1
+ProductName=
+ProductVersion=1.0.0.0
 Comments=
 [Excluded Packages]
 C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxEditorsVCLD7.bpl=ExpressEditors Library 5 (VCL Edition) by Developer Express Inc.

Dprs/Pro/Measure_GuangDong_TZ.dpr

@@ -136,19 +136,8 @@ uses
   rmGcl_XmjBillsDm in '..\..\DataModules\ReportMemoryDm\rmGcl_XmjBillsDm.pas' {rmGcl_XmjBillsData: TDataModule},
   rmCustomized2Dm in '..\..\DataModules\ReportMemoryDm\rmCustomized2Dm.pas' {rmCustomized2Data: TDataModule},
   CalcDecimal in '..\..\Units\CalcDecimal.pas',
-<<<<<<< HEAD
-<<<<<<< HEAD
-  BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
   DetailExcelImport in '..\..\Units\DetailExcelImport.pas',
-  mProgressProFrm in '..\..\Forms\mProgressProFrm.pas' {ProgressProForm};
-<<<<<<< HEAD
-=======
-=======
-=======
->>>>>>> 3.1.3.3
-  rmHaBaiCustomizedDm in '..\..\DataModules\ReportMemoryDm\rmHaBaiCustomizedDm.pas' {rmHaBaiCustomizedData: TDataModule},
-  BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
-=======
+  mProgressProFrm in '..\..\Forms\mProgressProFrm.pas' {ProgressProForm},
   BaseClipboard in '..\..\Units\BaseClipboard.pas',
   PriceMarginBillsDm in '..\..\DataModules\PriceMarginBillsDm.pas' {PriceMarginBillsData: TDataModule},
   ProjectGLDm in '..\..\DataModules\ProjectGLDm.pas' {ProjectGLData: TDataModule},
@@ -160,10 +149,7 @@ uses
   PriceMarginFme in '..\..\Frames\PriceMarginFme.pas' {PriceMarginFrame: TFrame},
   ProjectGLFme in '..\..\Frames\ProjectGLFme.pas' {ProjectGLFrame: TFrame},
   SelectDetailGLsFrm in '..\..\Forms\SelectDetailGLsFrm.pas' {SelectDetailGLsForm},
->>>>>>> 3.1.3.3PriceMargin(Temp)
   DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm};
->>>>>>> 3.1.3.3
->>>>>>> 4cecad11f3edfe92005226db79eccafb29339683
 
 {$R *.res}
 

Dprs/Pro/Measure_TZ.dof

@@ -114,25 +114,8 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=1
-<<<<<<< HEAD
-Release=5
-Build=102
-=======
-<<<<<<< HEAD
-Release=5
-Build=106
-=======
 Release=3
-<<<<<<< HEAD
-Build=2041
-<<<<<<< HEAD
->>>>>>> 3.1.3.3
-=======
-=======
-Build=3011
->>>>>>> 3.1.3.3PriceMargin(Temp)
->>>>>>> 3.1.3.3
->>>>>>> 4cecad11f3edfe92005226db79eccafb29339683
+Build=3013
 Debug=0
 PreRelease=0
 Special=0
@@ -143,58 +126,4 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横0号台账专业版
-<<<<<<< HEAD
-FileVersion=3.1.5.102
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
-FileVersion=3.1.5.106
-=======
-FileVersion=3.1.3.2041
->>>>>>> 3.1.3.3
-=======
-FileVersion=3.1.3.2041
-=======
-FileVersion=3.1.3.3011
->>>>>>> 3.1.3.3PriceMargin(Temp)
->>>>>>> 3.1.3.3
->>>>>>> 4cecad11f3edfe92005226db79eccafb29339683
-InternalName=Measure
-LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
-LegalTrademarks=Measure
-OriginalFilename=
-ProductName=纵横公路工程0号台账软件
-ProductVersion=1
-Comments=
-[Excluded Packages]
-C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxEditorsVCLD7.bpl=ExpressEditors Library 5 (VCL Edition) by Developer Express Inc.
-C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxExtEditorsVCLD7.bpl=ExpressExtendedEditors Library 5 (VCL Edition) by Developer Express Inc.
-[HistoryLists\hlConditionals]
-Count=11
-Item0=_mEncrypt;_mcompile;
-Item1=_mEncrypt;_mcompile;cplPrint;cplOutputToExcelRange
-Item2=_mEncrypt;cplPrint;cplOutputToExcelRange
-Item3=cplPrint;_mEncrypt;cplPrint;cplOutputToExcelRange
-Item4=cplPrint;_mEncrypt;cplPrint
-Item5=cplPrint;_mEncrypt
-Item6=cplPrint;
-Item7=cplPrint;_mEncrypt;
-Item8=cplPrint;mEncrypt;
-Item9=cplPrint
-Item10=cplPrint;cplOutputToExcelRange;
-[HistoryLists\hlUnitAliases]
-Count=1
-Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
-[HistoryLists\hlUnitOutputDirectory]
-Count=2
-Item0=..\..\Dcus
-Item1=..\Dcus
-[HistoryLists\hlOutputDirectorry]
-Count=7
-Item0=D:\SmartCostExe\Measure
-Item1=E:\SmartCostExe\Measure
-Item2=D:\Program Files (x86)\纵横软件\纵横计量决算一体化软件(专业版)
-Item3=D:\Program Files (x86)\纵横软件\纵横公路工程计量支付(专业版)
-Item4=D:\Program Files\纵横软件\Environment
-Item5=..\..\Environment
-Item6=..\Dcus
+FileVersion=3.1.3.3013

Dprs/Pro/Measure_TZ.dpr

@@ -136,19 +136,8 @@ uses
   rmGcl_XmjBillsDm in '..\..\DataModules\ReportMemoryDm\rmGcl_XmjBillsDm.pas' {rmGcl_XmjBillsData: TDataModule},
   rmCustomized2Dm in '..\..\DataModules\ReportMemoryDm\rmCustomized2Dm.pas' {rmCustomized2Data: TDataModule},
   CalcDecimal in '..\..\Units\CalcDecimal.pas',
-<<<<<<< HEAD
-<<<<<<< HEAD
-  BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
   DetailExcelImport in '..\..\Units\DetailExcelImport.pas',
-  mProgressProFrm in '..\..\Forms\mProgressProFrm.pas' {ProgressProForm};
-<<<<<<< HEAD
-=======
-=======
-=======
->>>>>>> 3.1.3.3
-  rmHaBaiCustomizedDm in '..\..\DataModules\ReportMemoryDm\rmHaBaiCustomizedDm.pas' {rmHaBaiCustomizedData: TDataModule},
-  BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
-=======
+  mProgressProFrm in '..\..\Forms\mProgressProFrm.pas' {ProgressProForm},
   BaseClipboard in '..\..\Units\BaseClipboard.pas',
   PriceMarginBillsDm in '..\..\DataModules\PriceMarginBillsDm.pas' {PriceMarginBillsData: TDataModule},
   ProjectGLDm in '..\..\DataModules\ProjectGLDm.pas' {ProjectGLData: TDataModule},
@@ -160,10 +149,7 @@ uses
   PriceMarginFme in '..\..\Frames\PriceMarginFme.pas' {PriceMarginFrame: TFrame},
   ProjectGLFme in '..\..\Frames\ProjectGLFme.pas' {ProjectGLFrame: TFrame},
   SelectDetailGLsFrm in '..\..\Forms\SelectDetailGLsFrm.pas' {SelectDetailGLsForm},
->>>>>>> 3.1.3.3PriceMargin(Temp)
   DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm};
->>>>>>> 3.1.3.3
->>>>>>> 4cecad11f3edfe92005226db79eccafb29339683
 
 {$R *.res}
 

Dprs/Trail/Measure.dof

@@ -114,25 +114,8 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=1
-<<<<<<< HEAD
-Release=5
-Build=102
-=======
-<<<<<<< HEAD
-Release=5
-Build=106
-=======
 Release=3
-<<<<<<< HEAD
-Build=2041
-<<<<<<< HEAD
->>>>>>> 3.1.3.3
-=======
-=======
-Build=3011
->>>>>>> 3.1.3.3PriceMargin(Temp)
->>>>>>> 3.1.3.3
->>>>>>> 4cecad11f3edfe92005226db79eccafb29339683
+Build=3013
 Debug=0
 PreRelease=0
 Special=0
@@ -143,59 +126,4 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化专业版
-<<<<<<< HEAD
-FileVersion=3.1.5.102
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
-FileVersion=3.1.5.106
-=======
-FileVersion=3.1.3.2041
->>>>>>> 3.1.3.3
-=======
-FileVersion=3.1.3.2041
-=======
-FileVersion=3.1.3.3011
->>>>>>> 3.1.3.3PriceMargin(Temp)
->>>>>>> 3.1.3.3
->>>>>>> 4cecad11f3edfe92005226db79eccafb29339683
-InternalName=Measure
-LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
-LegalTrademarks=Measure
-OriginalFilename=
-ProductName=纵横公路工程计量决算一体化软件
-ProductVersion=3
-Comments=
-[Excluded Packages]
-C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxEditorsVCLD7.bpl=ExpressEditors Library 5 (VCL Edition) by Developer Express Inc.
-C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxExtEditorsVCLD7.bpl=ExpressExtendedEditors Library 5 (VCL Edition) by Developer Express Inc.
-[HistoryLists\hlConditionals]
-Count=9
-Item0=_mEncrypt;cplPrint;cplOutputToExcelRange
-Item1=cplPrint;_mEncrypt;cplPrint;cplOutputToExcelRange
-Item2=cplPrint;_mEncrypt;cplPrint
-Item3=cplPrint;_mEncrypt
-Item4=cplPrint;
-Item5=cplPrint;_mEncrypt;
-Item6=cplPrint;mEncrypt;
-Item7=cplPrint
-Item8=cplPrint;cplOutputToExcelRange;
-[HistoryLists\hlUnitAliases]
-Count=1
-Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
-[HistoryLists\hlUnitOutputDirectory]
-Count=2
-Item0=..\..\Dcus
-Item1=..\Dcus
-[HistoryLists\hlOutputDirectorry]
-Count=10
-Item0=D:\SmartCostExe\MeasureTrail
-Item1=E:\SmartCostExe\MeasureTrail
-Item2=E:\SmartCostExe\Measure
-Item3=D:\Program Files (x86)\纵横软件\纵横计量决算一体化软件(广东专业版)
-Item4=D:\Program Files (x86)\纵横软件\纵横计量决算一体化软件(专业版)
-Item5=D:\Program Files (x86)\纵横软件\纵横计量决算一体化软件(专业版2)
-Item6=D:\Program Files (x86)\纵横软件\纵横公路工程计量支付(专业版)
-Item7=D:\Program Files\纵横软件\Environment
-Item8=..\..\Environment
-Item9=..\Dcus
+FileVersion=3.1.3.3013

Dprs/Trail/Measure.dpr

@@ -136,19 +136,8 @@ uses
   rmGcl_XmjBillsDm in '..\..\DataModules\ReportMemoryDm\rmGcl_XmjBillsDm.pas' {rmGcl_XmjBillsData: TDataModule},
   rmCustomized2Dm in '..\..\DataModules\ReportMemoryDm\rmCustomized2Dm.pas' {rmCustomized2Data: TDataModule},
   CalcDecimal in '..\..\Units\CalcDecimal.pas',
-<<<<<<< HEAD
-<<<<<<< HEAD
-  BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
   DetailExcelImport in '..\..\Units\DetailExcelImport.pas',
-  mProgressProFrm in '..\..\Forms\mProgressProFrm.pas' {ProgressProForm};
-<<<<<<< HEAD
-=======
-=======
-=======
->>>>>>> 3.1.3.3
-  rmHaBaiCustomizedDm in '..\..\DataModules\ReportMemoryDm\rmHaBaiCustomizedDm.pas' {rmHaBaiCustomizedData: TDataModule},
-  BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
-=======
+  mProgressProFrm in '..\..\Forms\mProgressProFrm.pas' {ProgressProForm},
   BaseClipboard in '..\..\Units\BaseClipboard.pas',
   PriceMarginBillsDm in '..\..\DataModules\PriceMarginBillsDm.pas' {PriceMarginBillsData: TDataModule},
   ProjectGLDm in '..\..\DataModules\ProjectGLDm.pas' {ProjectGLData: TDataModule},
@@ -160,10 +149,7 @@ uses
   PriceMarginFme in '..\..\Frames\PriceMarginFme.pas' {PriceMarginFrame: TFrame},
   ProjectGLFme in '..\..\Frames\ProjectGLFme.pas' {ProjectGLFrame: TFrame},
   SelectDetailGLsFrm in '..\..\Forms\SelectDetailGLsFrm.pas' {SelectDetailGLsForm},
->>>>>>> 3.1.3.3PriceMargin(Temp)
   DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm};
->>>>>>> 3.1.3.3
->>>>>>> 4cecad11f3edfe92005226db79eccafb29339683
 
 {$R *.res}
 

Dprs/Trail/Measure_GuangDong.dof

@@ -114,25 +114,8 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=1
-<<<<<<< HEAD
-Release=5
-Build=102
-=======
-<<<<<<< HEAD
-Release=5
-Build=106
-=======
 Release=3
-<<<<<<< HEAD
-Build=2041
-<<<<<<< HEAD
->>>>>>> 3.1.3.3
-=======
-=======
-Build=3011
->>>>>>> 3.1.3.3PriceMargin(Temp)
->>>>>>> 3.1.3.3
->>>>>>> 4cecad11f3edfe92005226db79eccafb29339683
+Build=3013
 Debug=0
 PreRelease=0
 Special=0
@@ -143,61 +126,4 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化广东学习版
-<<<<<<< HEAD
-FileVersion=3.1.5.102
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
-FileVersion=3.1.5.106
-=======
-FileVersion=3.1.3.2041
->>>>>>> 3.1.3.3
-=======
-FileVersion=3.1.3.2041
-=======
-FileVersion=3.1.3.3011
->>>>>>> 3.1.3.3PriceMargin(Temp)
->>>>>>> 3.1.3.3
->>>>>>> 4cecad11f3edfe92005226db79eccafb29339683
-InternalName=Measure
-LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
-LegalTrademarks=Measure
-OriginalFilename=
-ProductName=纵横公路工程计量决算一体化软件
-ProductVersion=3
-Comments=
-[Excluded Packages]
-C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxEditorsVCLD7.bpl=ExpressEditors Library 5 (VCL Edition) by Developer Express Inc.
-C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxExtEditorsVCLD7.bpl=ExpressExtendedEditors Library 5 (VCL Edition) by Developer Express Inc.
-[HistoryLists\hlConditionals]
-Count=12
-Item0=_mGuangDong
-Item1=_mEncrypt;_mGuangDong
-Item2=_mEncrypt;_mGuangDong;cplPrint;cplOutputToExcelRange
-Item3=_mEncrypt;cplPrint;cplOutputToExcelRange
-Item4=cplPrint;_mEncrypt;cplPrint;cplOutputToExcelRange
-Item5=cplPrint;_mEncrypt;cplPrint
-Item6=cplPrint;_mEncrypt
-Item7=cplPrint;
-Item8=cplPrint;_mEncrypt;
-Item9=cplPrint;mEncrypt;
-Item10=cplPrint
-Item11=cplPrint;cplOutputToExcelRange;
-[HistoryLists\hlUnitAliases]
-Count=1
-Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
-[HistoryLists\hlUnitOutputDirectory]
-Count=2
-Item0=..\..\Dcus
-Item1=..\Dcus
-[HistoryLists\hlOutputDirectorry]
-Count=9
-Item0=D:\SmartCostExe\MeasureTrail
-Item1=E:\SmartCostExe\MeasureTrail
-Item2=E:\SmartCostExe\Measure
-Item3=D:\Program Files (x86)\纵横软件\纵横计量决算一体化软件(专业版)
-Item4=D:\Program Files (x86)\纵横软件\纵横计量决算一体化软件(专业版2)
-Item5=D:\Program Files (x86)\纵横软件\纵横公路工程计量支付(专业版)
-Item6=D:\Program Files\纵横软件\Environment
-Item7=..\..\Environment
-Item8=..\Dcus
+FileVersion=3.1.3.3013

Dprs/Trail/Measure_GuangDong.dpr

@@ -136,19 +136,8 @@ uses
   rmGcl_XmjBillsDm in '..\..\DataModules\ReportMemoryDm\rmGcl_XmjBillsDm.pas' {rmGcl_XmjBillsData: TDataModule},
   rmCustomized2Dm in '..\..\DataModules\ReportMemoryDm\rmCustomized2Dm.pas' {rmCustomized2Data: TDataModule},
   CalcDecimal in '..\..\Units\CalcDecimal.pas',
-<<<<<<< HEAD
-<<<<<<< HEAD
-  BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
   DetailExcelImport in '..\..\Units\DetailExcelImport.pas',
-  mProgressProFrm in '..\..\Forms\mProgressProFrm.pas' {ProgressProForm};
-<<<<<<< HEAD
-=======
-=======
-=======
->>>>>>> 3.1.3.3
-  rmHaBaiCustomizedDm in '..\..\DataModules\ReportMemoryDm\rmHaBaiCustomizedDm.pas' {rmHaBaiCustomizedData: TDataModule},
-  BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
-=======
+  mProgressProFrm in '..\..\Forms\mProgressProFrm.pas' {ProgressProForm},
   BaseClipboard in '..\..\Units\BaseClipboard.pas',
   PriceMarginBillsDm in '..\..\DataModules\PriceMarginBillsDm.pas' {PriceMarginBillsData: TDataModule},
   ProjectGLDm in '..\..\DataModules\ProjectGLDm.pas' {ProjectGLData: TDataModule},
@@ -160,10 +149,7 @@ uses
   PriceMarginFme in '..\..\Frames\PriceMarginFme.pas' {PriceMarginFrame: TFrame},
   ProjectGLFme in '..\..\Frames\ProjectGLFme.pas' {ProjectGLFrame: TFrame},
   SelectDetailGLsFrm in '..\..\Forms\SelectDetailGLsFrm.pas' {SelectDetailGLsForm},
->>>>>>> 3.1.3.3PriceMargin(Temp)
   DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm};
->>>>>>> 3.1.3.3
->>>>>>> 4cecad11f3edfe92005226db79eccafb29339683
 
 {$R *.res}