From 484b5dedbc4f7aa084358da048f5e33917ac532e Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 31 Jan 2019 13:36:02 +0100 Subject: [PATCH] fix merge mistakes --- osu-resources | 1 - .../Application.cs~HEAD | 15 --------------- .../Application.cs~master | 15 --------------- osu.sln | 4 ---- 4 files changed, 35 deletions(-) delete mode 160000 osu-resources delete mode 100644 osu.Game.Rulesets.Catch.Tests.iOS/Application.cs~HEAD delete mode 100644 osu.Game.Rulesets.Catch.Tests.iOS/Application.cs~master diff --git a/osu-resources b/osu-resources deleted file mode 160000 index 677897728f..0000000000 --- a/osu-resources +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 677897728f4332fa1200e0280ca02c4b987c6c47 diff --git a/osu.Game.Rulesets.Catch.Tests.iOS/Application.cs~HEAD b/osu.Game.Rulesets.Catch.Tests.iOS/Application.cs~HEAD deleted file mode 100644 index 44817c1304..0000000000 --- a/osu.Game.Rulesets.Catch.Tests.iOS/Application.cs~HEAD +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. -// See the LICENCE file in the repository root for full licence text. - -using UIKit; - -namespace osu.Game.Rulesets.Catch.Tests.iOS -{ - public class Application - { - public static void Main(string[] args) - { - UIApplication.Main(args, null, "AppDelegate"); - } - } -} diff --git a/osu.Game.Rulesets.Catch.Tests.iOS/Application.cs~master b/osu.Game.Rulesets.Catch.Tests.iOS/Application.cs~master deleted file mode 100644 index 44817c1304..0000000000 --- a/osu.Game.Rulesets.Catch.Tests.iOS/Application.cs~master +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. -// See the LICENCE file in the repository root for full licence text. - -using UIKit; - -namespace osu.Game.Rulesets.Catch.Tests.iOS -{ - public class Application - { - public static void Main(string[] args) - { - UIApplication.Main(args, null, "AppDelegate"); - } - } -} diff --git a/osu.sln b/osu.sln index 7a418d41d4..3c38309d86 100644 --- a/osu.sln +++ b/osu.sln @@ -29,10 +29,6 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU - Debug|iPhoneSimulator = Debug|iPhoneSimulator - Release|iPhone = Release|iPhone - Release|iPhoneSimulator = Release|iPhoneSimulator - Debug|iPhone = Debug|iPhone EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {2A66DD92-ADB1-4994-89E2-C94E04ACDA0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU