Skip to content

Commit 89be669

Browse files
PWagner1PWagner1
committed
Resolve merge conflict by incorporating both suggestions
2 parents 8171cd5 + 409db7f commit 89be669

File tree

48 files changed

+212
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+212
-0
lines changed

‎Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.AdvancedDataGridView/Krypton.Toolkit.Suite.Extended.AdvancedDataGridView 2022.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,11 @@
9191

9292
<When Condition="'$(Configuration)' == 'Canary'">
9393
<ItemGroup>
94+
<<<<<<< HEAD
9495
<PackageReference Include="Krypton.Toolkit.Canary" Version="90.24.5.141-beta" />
96+
=======
97+
<PackageReference Include="Krypton.Toolkit.Canary" Version="90.24.4.113-beta" />
98+
>>>>>>> origin/canary
9599
</ItemGroup>
96100
</When>
97101

‎Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Buttons/Krypton.Toolkit.Suite.Extended.Buttons 2022.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,11 @@
8989

9090
<When Condition="'$(Configuration)' == 'Canary'">
9191
<ItemGroup>
92+
<<<<<<< HEAD
9293
<PackageReference Include="Krypton.Toolkit.Canary" Version="90.24.5.141-beta" />
94+
=======
95+
<PackageReference Include="Krypton.Toolkit.Canary" Version="90.24.4.113-beta" />
96+
>>>>>>> origin/canary
9397
</ItemGroup>
9498
</When>
9599

‎Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Calendar/Krypton.Toolkit.Suite.Extended.Calendar 2022.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,11 @@
8989

9090
<When Condition="'$(Configuration)' == 'Canary'">
9191
<ItemGroup>
92+
<<<<<<< HEAD
9293
<PackageReference Include="Krypton.Toolkit.Canary" Version="90.24.5.141-beta" />
94+
=======
95+
<PackageReference Include="Krypton.Toolkit.Canary" Version="90.24.4.113-beta" />
96+
>>>>>>> origin/canary
9397
</ItemGroup>
9498
</When>
9599

‎Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.CheckSum.Tools/Krypton.Toolkit.Suite.Extended.CheckSum.Tools 2022.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,11 @@
9191

9292
<When Condition="'$(Configuration)' == 'Canary'">
9393
<ItemGroup>
94+
<<<<<<< HEAD
9495
<PackageReference Include="Krypton.Toolkit.Canary" Version="90.24.5.141-beta" />
96+
=======
97+
<PackageReference Include="Krypton.Toolkit.Canary" Version="90.24.4.113-beta" />
98+
>>>>>>> origin/canary
9599
</ItemGroup>
96100
</When>
97101

‎Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Circular.ProgressBar/Krypton.Toolkit.Suite.Extended.Circular.ProgressBar 2022.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,11 @@
9191

9292
<When Condition="'$(Configuration)' == 'Canary'">
9393
<ItemGroup>
94+
<<<<<<< HEAD
9495
<PackageReference Include="Krypton.Toolkit.Canary" Version="90.24.5.141-beta" />
96+
=======
97+
<PackageReference Include="Krypton.Toolkit.Canary" Version="90.24.4.113-beta" />
98+
>>>>>>> origin/canary
9599
</ItemGroup>
96100
</When>
97101

‎Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.ComboBox/Krypton.Toolkit.Suite.Extended.ComboBox 2022.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,11 @@
9191

9292
<When Condition="'$(Configuration)' == 'Canary'">
9393
<ItemGroup>
94+
<<<<<<< HEAD
9495
<PackageReference Include="Krypton.Toolkit.Canary" Version="90.24.5.141-beta" />
96+
=======
97+
<PackageReference Include="Krypton.Toolkit.Canary" Version="90.24.4.113-beta" />
98+
>>>>>>> origin/canary
9599
</ItemGroup>
96100
</When>
97101

‎Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Common/Krypton.Toolkit.Suite.Extended.Common 2022.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,11 @@
9191

9292
<When Condition="'$(Configuration)' == 'Canary'">
9393
<ItemGroup>
94+
<<<<<<< HEAD
9495
<PackageReference Include="Krypton.Toolkit.Canary" Version="90.24.5.141-beta" />
96+
=======
97+
<PackageReference Include="Krypton.Toolkit.Canary" Version="90.24.4.113-beta" />
98+
>>>>>>> origin/canary
9599
</ItemGroup>
96100
</When>
97101

‎Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Compression/Krypton.Toolkit.Suite.Extended.Compression 2022.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,11 @@
9191

9292
<When Condition="'$(Configuration)' == 'Canary'">
9393
<ItemGroup>
94+
<<<<<<< HEAD
9495
<PackageReference Include="Krypton.Toolkit.Canary" Version="90.24.5.141-beta" />
96+
=======
97+
<PackageReference Include="Krypton.Toolkit.Canary" Version="90.24.4.113-beta" />
98+
>>>>>>> origin/canary
9599
</ItemGroup>
96100
</When>
97101

‎Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Controls/Krypton.Toolkit.Suite.Extended.Controls 2022.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,11 @@
9191

9292
<When Condition="'$(Configuration)' == 'Canary'">
9393
<ItemGroup>
94+
<<<<<<< HEAD
9495
<PackageReference Include="Krypton.Toolkit.Canary" Version="90.24.5.141-beta" />
96+
=======
97+
<PackageReference Include="Krypton.Toolkit.Canary" Version="90.24.4.113-beta" />
98+
>>>>>>> origin/canary
9599
</ItemGroup>
96100
</When>
97101

‎Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Core/Krypton.Toolkit.Suite.Extended.Core 2022.csproj‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,23 @@
102102
</PropertyGroup>
103103

104104
<ItemGroup>
105+
<<<<<<< HEAD
105106
<PackageReference Include="Krypton.Docking.Canary" Version="90.24.5.141-beta" />
106107

107108
<PackageReference Include="Krypton.Toolkit.Canary" Version="90.24.5.141-beta" />
108109

109110
<PackageReference Include="Krypton.Ribbon.Canary" Version="90.24.5.141-beta" />
110111

111112
<PackageReference Include="Krypton.Navigator.Canary" Version="90.24.5.141-beta" />
113+
=======
114+
<PackageReference Include="Krypton.Docking.Canary" Version="90.24.4.113-beta" />
115+
116+
<PackageReference Include="Krypton.Toolkit.Canary" Version="90.24.4.113-beta" />
117+
118+
<PackageReference Include="Krypton.Ribbon.Canary" Version="90.24.4.113-beta" />
119+
120+
<PackageReference Include="Krypton.Navigator.Canary" Version="90.24.4.113-beta" />
121+
>>>>>>> origin/canary
112122
</ItemGroup>
113123
</When>
114124

0 commit comments

Comments
 (0)