paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-21 15:29:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

* remove comment conflit

Browse Source
This commit is contained in:
pierre 2000-10-06 23:00:13 +00:00
parent e16fccc9d4
commit b60d042926
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ide/text/fpini.pas
View File

@ -1,9 +1,5 @@
{
<<<<<<< fpini.pas
$Id$
=======
$Id$
>>>>>>> 1.1.2.3
This file is part of the Free Pascal Integrated Development Environment
Copyright (c) 1998 by Berczi Gabor
@ -578,7 +574,10 @@ end;
end.
{
$Log$
Revision 1.3 2000-10-06 22:58:59 pierre
Revision 1.4 2000-10-06 23:00:13 pierre
* remove comment conflit
Revision 1.3 2000/10/06 22:58:59 pierre
* fixes for linux GDB tty command (merged)
Revision 1.2 2000/08/22 09:41:39 pierre