tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2025-11-04 23:50:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Merge Conflicts

Browse Source
This commit is contained in:
Thiago Loureiro
2019-06-01 19:52:34 +08:00
parent 57580afa74 b707cd6175
commit 60655c4056
545 changed files with 3522 additions and 3430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Ocelot.Provider.Kubernetes/KubeRegistryConfiguration.cs
View File

@@ -1,7 +1,4 @@
using KubeClient;
using System;
namespace Ocelot.Provider.Kubernetes
namespace Ocelot.Provider.Kubernetes
{
public class KubeRegistryConfiguration
{

4
src/Ocelot.Provider.Kubernetes/Ocelot.Provider.Kubernetes.csproj
View File

@@ -30,8 +30,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="KubeClient" Version="2.2.11" />
<PackageReference Include="KubeClient.Extensions.DependencyInjection" Version="2.2.11" />
<PackageReference Include="KubeClient" Version="2.2.12" />
<PackageReference Include="KubeClient.Extensions.DependencyInjection" Version="2.2.12" />
</ItemGroup>
<ItemGroup>