1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-06 07:42:55 +08:00

Fix merge errors

This commit is contained in:
smoogipoo 2018-03-19 20:23:31 +09:00
parent 4c0ccffe08
commit 46f10b392d

View File

@ -16,6 +16,7 @@ namespace osu.Game.Tests.Visual
public class TestCaseEditorCompose : OsuTestCase public class TestCaseEditorCompose : OsuTestCase
{ {
public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(Compose) }; public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(Compose) };
private DependencyContainer dependencies; private DependencyContainer dependencies;
protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnlyDependencyContainer parent) protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnlyDependencyContainer parent)