diff options
| author | hajny <hajny@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2006-08-23 22:23:53 +0000 |
|---|---|---|
| committer | hajny <hajny@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2006-08-23 22:23:53 +0000 |
| commit | 3bbf11e35d5760555466d68ee292be7a0d6d283d (patch) | |
| tree | 359fb0d09af22e1f2fa01cff543ffa4524aacf84 | |
| parent | c41ee7570c714fa699a048c1d293da84ba6c3506 (diff) | |
| download | fpc-3bbf11e35d5760555466d68ee292be7a0d6d283d.tar.gz | |
* fix for incorrectly performed merge operation
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_2_0@4496 3ad0048d-3df7-0310-abae-a5850022a9f2
| -rw-r--r-- | compiler/msg/errorhe.msg | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/compiler/msg/errorhe.msg b/compiler/msg/errorhe.msg index 4540733bb2..70c53ece79 100644 --- a/compiler/msg/errorhe.msg +++ b/compiler/msg/errorhe.msg @@ -2440,9 +2440,7 @@ S*2Aas_אסוף עם GNU AS **2sr_דלג על רישום הקצאת מופע (השתמש בייחד עם -alr) **1T<x>_מטרת מערכת ההפעלה: 3*2Temx_OS/2 בשימוש EMX ( בייחד עם הרחבת EMX/RSX) ->>>>>>> .merge-right.r4436 3*2Tfreebsd_FreeBSD -3*2Tgo32v2_Version 2 of DJ Delorie DOS extender 3*2Tgo32v2_גרסה 2 של הרחבת DJ Delorie DOS 3*2Tlinux_Linux 3*2Tnetbsd_NetBSD |