Rename MiniYaml MergeLiberal -> MergePartial, MergeStrict -> Merge.

This commit is contained in:
Paul Chote
2015-05-10 15:45:33 +01:00
committed by Oliver Brakmann
parent abed25d293
commit a074bb1d4b
14 changed files with 21 additions and 21 deletions

View File

@@ -97,7 +97,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
// Add a group for each campaign
if (Game.ModData.Manifest.Missions.Any())
{
var yaml = Game.ModData.Manifest.Missions.Select(MiniYaml.FromFile).Aggregate(MiniYaml.MergeLiberal);
var yaml = Game.ModData.Manifest.Missions.Select(MiniYaml.FromFile).Aggregate(MiniYaml.MergePartial);
foreach (var kv in yaml)
{