解决冲突

Units/ProjectData.pas

@@ -276,11 +276,7 @@ uses
   ZJJLDm, PHPWebDm, XMLDoc, XMLIntf, ConstUnit, PasswordInputFrm,
   mProgressProFrm, mDataRecord, ConditionalDefines, DbTreeImport,
   StrUtils, sdProvider, CalcDecimal, Math, CslJson, OrderCheckerFme,
-<<<<<<< HEAD
-  stgSubGatherFile;
-=======
-  Forms, ProgressHintFrm, BillsTree, Controls;
->>>>>>> tempCalc
+  stgSubGatherFile, Forms, ProgressHintFrm, BillsTree, Controls;
 
 { TProjectData }
 
@@ -2224,7 +2220,6 @@ begin
   end
 end;
 
-<<<<<<< HEAD
 procedure TProjectData.OpenForSumUpBase(const AFileName: string);
 begin
   FProjectID := -1;
@@ -2255,7 +2250,9 @@ begin
   finally
     CalculateAll;
     vImportor.Free;
-=======
+  end;
+end;
+
 procedure TProjectData.CheckCalcBeforeSave;
 
   function NeedReCalc: Boolean;
@@ -2286,7 +2283,6 @@ begin
     finally
       Screen.Cursor := crDefault;
     end;
->>>>>>> tempCalc
   end;
 end;