Skip to content

Commit 429c0cf

Browse files
committed
Merge conflicts
1 parent 81b2750 commit 429c0cf

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

Nice3point.Revit.Extensions.slnx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
<Solution>
1+
<Solution>
22
<Configurations>
3+
<BuildType Name="Debug R19" />
34
<BuildType Name="Debug R20" />
45
<BuildType Name="Debug R21" />
56
<BuildType Name="Debug R22" />
67
<BuildType Name="Debug R23" />
78
<BuildType Name="Debug R24" />
89
<BuildType Name="Debug R25" />
910
<BuildType Name="Debug R26" />
11+
<BuildType Name="Release R19" />
1012
<BuildType Name="Release R20" />
1113
<BuildType Name="Release R21" />
1214
<BuildType Name="Release R22" />
@@ -17,7 +19,7 @@
1719
<BuildType Name="Release Tests" />
1820
</Configurations>
1921
<Folder Name="/Automation/">
20-
<Project Path="build/Build.csproj" Type="C#">
22+
<Project Path="build/Build.csproj">
2123
<BuildType Project="Debug" />
2224
</Project>
2325
</Folder>
@@ -28,6 +30,7 @@
2830
</Folder>
2931
<Folder Name="/Tests/">
3032
<Project Path="tests/Nice3point.Revit.Extensions.Tests/Nice3point.Revit.Extensions.Tests.csproj">
33+
<BuildType Solution="Debug R19|*" Project="Debug" />
3134
<BuildType Solution="Debug R20|*" Project="Debug" />
3235
<BuildType Solution="Debug R21|*" Project="Debug" />
3336
<BuildType Solution="Debug R22|*" Project="Debug" />
@@ -43,6 +46,7 @@
4346
<BuildType Solution="Release R25|*" Project="Release" />
4447
<BuildType Solution="Release R26|*" Project="Release" />
4548
<BuildType Solution="Release Tests|*" Project="Release" />
49+
<Build Solution="Debug R19|*" Project="false" />
4650
<Build Solution="Debug R20|*" Project="false" />
4751
<Build Solution="Debug R21|*" Project="false" />
4852
<Build Solution="Debug R22|*" Project="false" />

0 commit comments

Comments
 (0)