Browse Source

* fixed merging problem

florian 25 years ago
parent
commit
3930823dcd
1 changed files with 4 additions and 5 deletions
  1. 4 5
      rtl/objpas/sysstrh.inc

+ 4 - 5
rtl/objpas/sysstrh.inc

@@ -87,8 +87,6 @@ Function FloatToStrF(Value: Extended; format: TFloatFormat; Precision, Digits: I
 Function FloatToStr(Value: Extended): String;
 Function FloatToStr(Value: Extended): String;
 Function StrToFloat(Value : String) : Extended;
 Function StrToFloat(Value : String) : Extended;
 Function FloatToText(Buffer: PChar; Value: Extended; format: TFloatFormat; Precision, Digits: Integer): Longint;
 Function FloatToText(Buffer: PChar; Value: Extended; format: TFloatFormat; Precision, Digits: Integer): Longint;
-<<<<<<< sysstrh.inc
-
 Function FloatToDateTime (Const Value : Extended) : TDateTime;
 Function FloatToDateTime (Const Value : Extended) : TDateTime;
 Function FloattoCurr (Const Value : Extended) : Currency;
 Function FloattoCurr (Const Value : Extended) : Currency;
 Function CurrToStr(Value: Currency): string;
 Function CurrToStr(Value: Currency): string;
@@ -96,9 +94,7 @@ function StrToCurr(const S: string): Currency;
 function StrToBool(const S: string): Boolean;
 function StrToBool(const S: string): Boolean;
 function BoolToStr(B: Boolean): string;
 function BoolToStr(B: Boolean): string;
 
 
-=======
 function LastDelimiter(const Delimiters, S: string): Integer;
 function LastDelimiter(const Delimiters, S: string): Integer;
->>>>>>> 1.1.2.2
 
 
 {==============================================================================}
 {==============================================================================}
 {   extra functions                                                            }
 {   extra functions                                                            }
@@ -110,7 +106,10 @@ function BCDToInt(Value: integer): integer;
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.5  2000-12-07 21:58:30  michael
+  Revision 1.6  2000-12-09 10:39:50  florian
+    * fixed merging problem
+
+  Revision 1.5  2000/12/07 21:58:30  michael
   + Merged lastdelimiter from fixbranch
   + Merged lastdelimiter from fixbranch
 
 
   Revision 1.4  2000/08/13 17:55:38  michael
   Revision 1.4  2000/08/13 17:55:38  michael