Skip to content
Snippets Groups Projects
Commit d17452df authored by Daniel Andrášik's avatar Daniel Andrášik
Browse files

Resolve confilicts

parents 7df38639 40887c74
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
SDK/Helpers/Address.cs
+ 1
− 1
View file @ d17452df
......@@ -29,7 +29,7 @@ namespace SDK.Models
public const string Branches = "branches/";
public const string Clients = "branches/";
public const string Clients = "clients/";
public const string Configuration = "configuration/";
public const string ConfigurationBranch = "configuration/branch/";
......
SDK/SDK.csproj
+ 1
− 1
View file @ d17452df
......@@ -5,7 +5,7 @@
<TargetFramework>net6.0</TargetFramework>
<AssemblyVersion>2021.6.28.25</AssemblyVersion>
<FileVersion>2021.6.28.25</FileVersion>
<Version>4.6.0</Version>
<Version>4.7.0</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
</PropertyGroup>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment