|
@@ -573,7 +573,6 @@ procedure TFPFontCacheList.ReadStandardFonts;
|
|
|
{$ifend}
|
|
{$ifend}
|
|
|
|
|
|
|
|
|
|
|
|
|
-<<<<<<< HEAD
|
|
|
|
|
{$ifdef mswindows}
|
|
{$ifdef mswindows}
|
|
|
function GetWinFontsDir: string;
|
|
function GetWinFontsDir: string;
|
|
|
var
|
|
var
|
|
@@ -594,8 +593,6 @@ procedure TFPFontCacheList.ReadStandardFonts;
|
|
|
{$endif}
|
|
{$endif}
|
|
|
end;
|
|
end;
|
|
|
{$endif}
|
|
{$endif}
|
|
|
-=======
|
|
|
|
|
->>>>>>> 354ae2344e... * Add fontmapper by Anton Kavalenka. Fixes issue #39363
|
|
|
|
|
|
|
|
|
|
{$ifdef HasFontsConf}
|
|
{$ifdef HasFontsConf}
|
|
|
var
|
|
var
|
marcoonthegit