paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-22 16:19:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed error because of conflicted merge

Browse Source 
git-svn-id: trunk@6348 -
This commit is contained in:
vincents 2004-12-07 06:28:09 +00:00
parent 9783f54fb3
commit 28f838614a
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ide/compileroptions.pp
View File

@ -647,7 +647,7 @@ begin
end;
{------------------------------------------------------------------------------
TfrmCompilerOptions LoadCompilerOptions
TBaseCompilerOptions LoadCompilerOptions
------------------------------------------------------------------------------}
procedure TBaseCompilerOptions.LoadCompilerOptions(UseExistingFile: Boolean);
var

4
lcl/include/control.inc
View File

@ -2148,7 +2148,6 @@ begin
{$ELSE}
if TMethod(@Self.GetTextBuf).Code = Pointer(@TControl.GetTextBuf)
{$ENDIF}
=======
then begin
Result := RealGetText;
end
@ -3428,6 +3427,9 @@ end;
{ =============================================================================
$Log$
Revision 1.224 2004/12/07 06:28:09 vincents
fixed error because of conflicted merge
Revision 1.223 2004/12/07 03:15:32 vincents
fixed fpc 1.0.x compilation