mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-04-06 17:08:01 +02:00
Fix error in conflict resolution of previous merge
git-svn-id: branches/fixes_3_2@49042 -
This commit is contained in:
parent
e1b53067a6
commit
7eaac123c0
@ -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];
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user