+ Fix for bug report 2097 in formatbuf

rtl/objpas/sysstr.inc

@@ -947,11 +947,7 @@ begin
   if fmtlen > 0 then
     Move(fmt,F[1],fmtlen);
   S:=Format (F,Args);
-<<<<<<< sysstr.inc
   If Cardinal(Length(S))>Buflen then
-=======
-  If cardinal(Length(S))>Buflen then
->>>>>>> 1.1.2.9
     Result:=Length(S)
   else
     Result:=Buflen;
@@ -1342,7 +1338,10 @@ const
 
 {
   $Log$
-  Revision 1.16  2002-08-29 10:04:25  michael
+  Revision 1.17  2002-08-29 10:04:48  michael
+  + Fix for bug report 2097 in formatbuf
+
+  Revision 1.16  2002/08/29 10:04:25  michael
   + Fix for bug report 2097 in formatbuf
 
   Revision 1.15  2002/07/06 12:14:03  daniel