Merge conflicts from upstream

This commit is contained in:
Lucas Scharenbroich 2018-04-14 13:31:29 -05:00
parent c530b88604
commit d63087795f

View File

@ -335,7 +335,7 @@ namespace SpriteCompiler.Test
return; return;
} }
foreach (var step in solution.Skip(1)) foreach (var step in solution.ToList().Skip(1))
{ {
Trace.WriteLine(step.Action.Emit()); Trace.WriteLine(step.Action.Emit());
} }