resolve merge conflicts
[teamcity/dotNetPackagesSupport.git] / nuget-extensions / nuget-runner /
drwxr-xr-x   ..
drwxr-xr-x - Properties
-rw-r--r-- 2730 nuget-runner.csproj
-rw-r--r-- 151 nuget-runner.csproj.ReSharper
drwxr-xr-x - src