Skip to content

Commit 8cd8c6f

Browse files
committed
fix
1 parent 49fd44f commit 8cd8c6f

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

docs/consume-packages/Package-Restore.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ You can trigger Package Restore in any of the following ways:
3434

3535
- **nuget.exe CLI**: Use the [nuget restore](../tools/cli-ref-restore.md) command to restore packages listed in a project or solution file, or in `packages.config`.
3636

37-
<<<<<<< HEAD
3837
- **MSBuild**: Use the [msbuild -t:restore](../reference/msbuild-targets.md#restore-target) command to restore packages listed in the project file with PackageReference. This command is available only in NuGet 4.x+ and MSBuild 15.1+, which are included with Visual Studio 2017 and higher versions. Both `nuget restore` and `dotnet restore` use this command for applicable projects.
3938

4039
- **Azure Pipelines**: When you create a build definition in Azure Pipelines, include the NuGet [restore](/azure/devops/pipelines/tasks/package/nuget#restore-nuget-packages) or .NET Core [restore](/azure/devops/pipelines/tasks/build/dotnet-core#restore-nuget-packages) task in the definition before any build tasks. Some build templates include the restore task by default.

0 commit comments

Comments
 (0)