Merge remote-tracking branch 'origin/master'
# Conflicts: # Polonium.Generators.csproj
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hangman.SDK.Generators", "Hangman.SDK.Generators.csproj", "{884B5A6A-4063-4FC7-8FE6-EE1C45CF251E}"
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Polonium.Generators", "Polonium.Generators.csproj", "{884B5A6A-4063-4FC7-8FE6-EE1C45CF251E}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
|
||||
Reference in New Issue
Block a user