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.

Sign up for GitHub

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

Jump to bottom

Fix up bad merge in Extensions.sln #1030

Merged
merged 1 commit into from
Jan 31, 2019
Merged

Fix up bad merge in Extensions.sln #1030

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions Extensions.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1616,7 +1616,6 @@ Global
{97AE13C4-B72C-4E30-8835-FF1603A9E224}.Release|x64.Build.0 = Release|Any CPU
{97AE13C4-B72C-4E30-8835-FF1603A9E224}.Release|x86.ActiveCfg = Release|Any CPU
{97AE13C4-B72C-4E30-8835-FF1603A9E224}.Release|x86.Build.0 = Release|Any CPU
<<<<<<< HEAD
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Both sets of GUIDs are in use

{1A203DA9-D706-4094-B549-2611C6DA38F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1A203DA9-D706-4094-B549-2611C6DA38F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1A203DA9-D706-4094-B549-2611C6DA38F4}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand All @@ -1629,7 +1628,6 @@ Global
{1A203DA9-D706-4094-B549-2611C6DA38F4}.Release|x64.Build.0 = Release|Any CPU
{1A203DA9-D706-4094-B549-2611C6DA38F4}.Release|x86.ActiveCfg = Release|Any CPU
{1A203DA9-D706-4094-B549-2611C6DA38F4}.Release|x86.Build.0 = Release|Any CPU
=======
{AC33A64E-1261-47E7-8676-69C48E4B0266}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AC33A64E-1261-47E7-8676-69C48E4B0266}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AC33A64E-1261-47E7-8676-69C48E4B0266}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -1666,7 +1664,6 @@ Global
{9FE05F36-5626-416D-956D-5C4C6D7E3E1B}.Release|x64.Build.0 = Release|Any CPU
{9FE05F36-5626-416D-956D-5C4C6D7E3E1B}.Release|x86.ActiveCfg = Release|Any CPU
{9FE05F36-5626-416D-956D-5C4C6D7E3E1B}.Release|x86.Build.0 = Release|Any CPU
>>>>>>> release/2.1
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down