+ Implemented missing StringReplace function

rtl/objpas/sysstrh.inc

@@ -30,17 +30,12 @@ type
    
    { For FloatToText } 
    TFloatFormat = (ffGeneral, ffExponent, ffFixed, ffNumber, ffCurrency);
-<<<<<<< sysstrh.inc
    
 const
   { For floattodatetime }
   MinDateTime: TDateTime = -657434.0;      { 01/01/0100 12:00:00.000 AM }
   MaxDateTime: TDateTime =  2958465.99999; { 12/31/9999 11:59:59.999 PM }
        
-=======
-
-
->>>>>>> 1.1.2.2
 function NewStr(const S: string): PString;
 procedure DisposeStr(S: PString);
 procedure AssignStr(var P: PString; const S: string);
@@ -111,7 +106,10 @@ function BCDToInt(Value: integer): integer;
 
 {
   $Log$
-  Revision 1.7  2001-09-20 14:38:41  michael
+  Revision 1.8  2001-09-20 14:39:43  michael
+  + Implemented missing StringReplace function
+
+  Revision 1.7  2001/09/20 14:38:41  michael
    Implemented missing StringReplace function
 
   Revision 1.6  2000/12/09 10:39:50  florian