Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync with the ultimate master #250

Merged
merged 2 commits into from
Nov 22, 2024

Conversation

net-jetbot[bot]
Copy link

@net-jetbot net-jetbot bot commented Nov 22, 2024

Sync with the ultimate master.

ww898 and others added 2 commits November 22, 2024 06:47
This reverts commit 5af1bffbb2e90af41248754da4344a7ce1c55215.

# Conflicts:
#	dotnet/Plugins/ReSharperUnity/resharper/resharper-unity/test/src/PackagesLock.targets
#	dotnet/Plugins/resharper-fsharp/ReSharper.FSharp/src/FSharp.Fantomas.Host/PackagesLock.targets
#	dotnet/Plugins/resharper-fsharp/ReSharper.FSharp/src/FSharp/PackagesLock.targets
#	dotnet/Plugins/resharper-fsharp/ReSharper.FSharp/test/src/PackagesLock.targets
#	dotnet/Plugins/rider-efcore/src/dotnet/Rider.Plugins.EfCore/PackagesLock.targets

GitOrigin-RevId: f29425e5b7a1dcecc51dfe70fd0c6583b38f6dfa
GitOrigin-RevId: a7bb82b141c730b9263518344c3e45fbcbcfa560
@seclerp seclerp merged commit 1118fde into main Nov 22, 2024
1 check failed
@seclerp seclerp deleted the plugins-sync/merge-robot-ultimate-master-2024-11-22 branch December 4, 2024 00:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants