Skip to content

Commit eee6fd1

Browse files
authored
Merge pull request #153 from twilio-labs/revert-151-niels/use-latest-twilio-lib
Change order to resolve merge conflict
2 parents eea8a89 + e624ac2 commit eee6fd1

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/Twilio.AspNet.Core/Twilio.AspNet.Core.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<PrivateAssets>all</PrivateAssets>
3636
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3737
</PackageReference>
38-
<PackageReference Include="Twilio" Version="7.8.0" />
38+
<PackageReference Include="Twilio" Version="7.7.0" />
3939
<PackageReference Include="Twilio.AspNet.Common" Version="0.0.0-alpha" />
4040

4141
<FrameworkReference Include="Microsoft.AspNetCore.App" />

src/Twilio.AspNet.Mvc.UnitTests/Twilio.AspNet.Mvc.UnitTests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<PrivateAssets>all</PrivateAssets>
3535
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3636
</PackageReference>
37-
<PackageReference Include="Twilio" Version="7.8.0" />
37+
<PackageReference Include="Twilio" Version="7.7.0" />
3838
<PackageReference Include="xunit" Version="2.9.2" />
3939
<PackageReference Include="xunit.abstractions" Version="2.0.3" />
4040
<PackageReference Include="xunit.analyzers" Version="1.17.0">

src/Twilio.AspNet.Mvc/Twilio.AspNet.Mvc.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<PrivateAssets>all</PrivateAssets>
5757
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
5858
</PackageReference>
59-
<PackageReference Include="Twilio" Version="7.8.0" />
59+
<PackageReference Include="Twilio" Version="7.7.0" />
6060
<PackageReference Include="Twilio.AspNet.Common" Version="0.0.0-alpha" />
6161
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
6262
<PrivateAssets>all</PrivateAssets>

0 commit comments

Comments
 (0)