Skip to content

Commit

Permalink
Merge pull request #6279 from Susko3/fix-xamarin-jetbrains-annotation…
Browse files Browse the repository at this point in the history
…s-conflicts

Fix `Xamarin.Jetbrains.Annotations` conflicting with `Jetbrains.Annotations`
  • Loading branch information
smoogipoo authored May 7, 2024
2 parents 267129d + 375a879 commit 004fae4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion osu.Framework.Android/osu.Framework.Android.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="ppy.SDL3-CS.Android" Version="2024.418.1" />
<PackageReference Include="Xamarin.AndroidX.Window" Version="1.2.0.1" />
<PackageReference Include="Xamarin.AndroidX.Window" Version="1.2.0.1" PrivateAssets="compile" />
</ItemGroup>
</Project>

0 comments on commit 004fae4

Please sign in to comment.