resolve merge conflicts
[teamcity/dotNetPackagesSupport.git] / nuget-common / src /
drwxr-xr-x   ..
drwxr-xr-x - jetbrains