h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 22:22:55 +08:00
Code Issues Releases Wiki Activity

left merge markers in test file

Browse Source
This commit is contained in:
Xexxar 2021-09-25 02:56:07 +00:00
commit 8090b071a5
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
View File

@ -15,15 +15,6 @@ namespace osu.Game.Rulesets.Osu.Tests
{ {
protected override string ResourceAssembly => "osu.Game.Rulesets.Osu"; protected override string ResourceAssembly => "osu.Game.Rulesets.Osu";
<<<<<<< HEAD
[TestCase(6.6915334809485199d, "diffcalc-test")]
[TestCase(1.0366129190339499d, "zero-length-sliders")]
public void Test(double expected, string name)
=> base.Test(expected, name);
[TestCase(8.3966904501824473d, "diffcalc-test")]
[TestCase(1.2732783892964523d, "zero-length-sliders")]
=======
[TestCase(6.6634445062299665d, "diffcalc-test")] [TestCase(6.6634445062299665d, "diffcalc-test")]
[TestCase(1.0414203870195022d, "zero-length-sliders")] [TestCase(1.0414203870195022d, "zero-length-sliders")]
public void Test(double expected, string name) public void Test(double expected, string name)
@ -31,7 +22,6 @@ namespace osu.Game.Rulesets.Osu.Tests
[TestCase(8.3858089051603368d, "diffcalc-test")] [TestCase(8.3858089051603368d, "diffcalc-test")]
[TestCase(1.2723279173428435d, "zero-length-sliders")] [TestCase(1.2723279173428435d, "zero-length-sliders")]
>>>>>>> ppy/master
public void TestClockRateAdjusted(double expected, string name) public void TestClockRateAdjusted(double expected, string name)
=> Test(expected, name, new OsuModDoubleTime()); => Test(expected, name, new OsuModDoubleTime());