Auto stash before merge of "main" and "origin/main"

This commit is contained in:
stijn
2021-02-10 09:20:19 +01:00
parent d575bec743
commit 8f71ca1be5
4 changed files with 167 additions and 5 deletions

View File

@@ -5,6 +5,8 @@ VisualStudioVersion = 14.0.23107.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{54F91283-7BC4-4236-8FF9-10F437C3AD48}") = "Microcontrollers", "Microcontrollers\Microcontrollers.cproj", "{2285C48D-296E-43FD-A7B6-69885F64CFFD}"
EndProject
Project("{54F91283-7BC4-4236-8FF9-10F437C3AD48}") = "opdracht 2.7a", "opdracht 2.7a\opdracht 2.7a.cproj", "{B7ED8D27-9387-4A45-A238-923F89602FB5}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|AVR = Debug|AVR
@@ -15,6 +17,10 @@ Global
{2285C48D-296E-43FD-A7B6-69885F64CFFD}.Debug|AVR.Build.0 = Debug|AVR
{2285C48D-296E-43FD-A7B6-69885F64CFFD}.Release|AVR.ActiveCfg = Release|AVR
{2285C48D-296E-43FD-A7B6-69885F64CFFD}.Release|AVR.Build.0 = Release|AVR
{B7ED8D27-9387-4A45-A238-923F89602FB5}.Debug|AVR.ActiveCfg = Debug|AVR
{B7ED8D27-9387-4A45-A238-923F89602FB5}.Debug|AVR.Build.0 = Debug|AVR
{B7ED8D27-9387-4A45-A238-923F89602FB5}.Release|AVR.ActiveCfg = Release|AVR
{B7ED8D27-9387-4A45-A238-923F89602FB5}.Release|AVR.Build.0 = Release|AVR
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE