Merge 43103, removing conflict ------------------------------------------------------------------------ r43103 | pierre | 2019-10-01 12:50:26 +0000 (Tue, 01 Oct 2019) | 1 line
Remove symbian from fppkg OS list ------------------------------------------------------------------------ --- Merging r43103 into '.': C utils/fppkg/fpmake.pp --- Recording mergeinfo for merge of r43103 into '.': U . Summary of conflicts: Text conflicts: 1