diff options
author | pierre <pierre@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2021-03-24 00:11:34 +0000 |
---|---|---|
committer | pierre <pierre@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2021-03-24 00:11:34 +0000 |
commit | d0a4cf5fe4973cfc598876e8ac98fcbf4f04e7d9 (patch) | |
tree | f171bd4db8a0bf1fb2e5aae2261066145bcf4249 | |
parent | c2cf0735e39d4a0d83710b82e873ef57f77e9c15 (diff) | |
download | fpc-d0a4cf5fe4973cfc598876e8ac98fcbf4f04e7d9.tar.gz |
Fix error in conflict resolution of previous merge
git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_2@49042 3ad0048d-3df7-0310-abae-a5850022a9f2
-rw-r--r-- | utils/fpmake.pp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/utils/fpmake.pp b/utils/fpmake.pp index 28f3bbcd66..52cfbab66a 100644 --- a/utils/fpmake.pp +++ b/utils/fpmake.pp @@ -51,8 +51,7 @@ begin begin P:=AddPackage('utils'); P.ShortName := 'tils'; - P.OSes:=AllOSes-[embedded,msdos,win16,macos,palmos]; - P.OSes:=AllOSes-[embedded,msdos,win16,macos,palmos]; + P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos]; if Defaults.CPU=jvm then P.OSes := P.OSes - [java,android]; |