File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 99 Basically: In this file, choose the highest version when resolving merge conflicts.
1010 -->
1111 <PropertyGroup >
12- <MicrosoftWindowsSDKNETRef10_0_17763PackageVersion >10.0.17763.22 </MicrosoftWindowsSDKNETRef10_0_17763PackageVersion >
13- <MicrosoftWindowsSDKNETRef10_0_18362PackageVersion >10.0.18362.22 </MicrosoftWindowsSDKNETRef10_0_18362PackageVersion >
14- <MicrosoftWindowsSDKNETRef10_0_19041PackageVersion >10.0.19041.22 </MicrosoftWindowsSDKNETRef10_0_19041PackageVersion >
15- <MicrosoftWindowsSDKNETRef10_0_20348PackageVersion >10.0.20348.22 </MicrosoftWindowsSDKNETRef10_0_20348PackageVersion >
16- <MicrosoftWindowsSDKNETRef10_0_22000PackageVersion >10.0.22000.22 </MicrosoftWindowsSDKNETRef10_0_22000PackageVersion >
12+ <MicrosoftWindowsSDKNETRef10_0_17763PackageVersion >10.0.17763.23 </MicrosoftWindowsSDKNETRef10_0_17763PackageVersion >
13+ <MicrosoftWindowsSDKNETRef10_0_18362PackageVersion >10.0.18362.23 </MicrosoftWindowsSDKNETRef10_0_18362PackageVersion >
14+ <MicrosoftWindowsSDKNETRef10_0_19041PackageVersion >10.0.19041.23 </MicrosoftWindowsSDKNETRef10_0_19041PackageVersion >
15+ <MicrosoftWindowsSDKNETRef10_0_20348PackageVersion >10.0.20348.23 </MicrosoftWindowsSDKNETRef10_0_20348PackageVersion >
16+ <MicrosoftWindowsSDKNETRef10_0_22000PackageVersion >10.0.22000.23 </MicrosoftWindowsSDKNETRef10_0_22000PackageVersion >
1717 </PropertyGroup >
1818</Project >
You can’t perform that action at this time.
0 commit comments