resolve merge conflicts
[teamcity/dotNetPackagesSupport.git] / nuget-server / src / META-INF /
drwxr-xr-x   ..
-rw-r--r-- 941 build-server-plugin-nuget.xml