Fixed merge conflict (#1265)

Also fixed couple of typos.
dotnet · Nov 17, 2016 · cde9d95 · cde9d95
1 parent ab71aab
commit cde9d95
Showing 1 changed file with 2 additions and 50 deletions.
diff --git a/docs/core/preview3/tools/dotnet-msbuild.md b/docs/core/preview3/tools/dotnet-msbuild.md
@@ -1,51 +1,5 @@
-<<<<<<< 94aa2d71d55ffa4d42044bb4ebb8d8e06d13d394
 ---
-title: dotnet-msmsbuild command | .NET Core SDK
-description: The dotnet-msmsbuild command provides access to MSmsbuild command line
-keywords: dotnet-msmsbuild, CLI, CLI command, .NET Core
-author: mairaw
-manager: wpickett
-ms.date: 10/13/2016
-ms.topic: article
-ms.prod: .net-core
-ms.technology: .net-core-technologies
-ms.devlang: dotnet
-ms.assetid: 70285a83-4103-4617-be8b-d0e1e9a4a91d
----
-
-#dotnet-m/msbuild
-
-## Name 
-dotnet-msbuild -- msbuilds a project and all of its dependencies 
-
-## Synopsis
-
-`dotnet msbuild <msbuild_arguments>`
-
-## Description
-The `dotnet msbuild` command allows access to a fully functional MSBuild 
-
-The command has the exact same capablities as existing MSBuild command line client. The options are all the same. You can 
-use the [existing documentation](https://msdn.microsoft.com/en-us/library/ms164311.aspx) to get familiar with the command 
-reference. 
-
-## Examples
-
-Build a project and its dependencies:
-
-`dotnet msbuild`
-
-Build a project and its dependencies using Release configuration:
-
-`dotnet msbuild /p:Configuration=Release--configuration Release`
-
-Run the publish target and publish for the `osx.10.11-x64` RID:
-
-`dotnet msbuild /t:Publish /p:RuntimeIdentifiers=osx.10.11-x64`
-
-=======
----
-title: dotnet-msmsbuild command | .NET Core SDK
+title: dotnet-msbuild command | .NET Core SDK
 description: The dotnet-msmsbuild command provides access to MSmsbuild command line
 keywords: dotnet-msmsbuild, CLI, CLI command, .NET Core
 author: mairaw
@@ -70,7 +24,7 @@ dotnet-msbuild -- Builds a project and all of its dependencies
 ## Description
 The `dotnet msbuild` command allows access to a fully functional MSBuild 
 
-The command has the exact same capablities as existing MSBuild command line client. The options are all the same. You can 
+The command has the exact same capabilities as existing MSBuild command line client. The options are all the same. You can 
 use the [existing documentation](https://msdn.microsoft.com/en-us/library/ms164311.aspx) to get familiar with the command 
 reference. 
 
@@ -87,5 +41,3 @@ Build a project and its dependencies using Release configuration:
 Run the publish target and publish for the `osx.10.11-x64` RID:
 
 `dotnet msbuild /t:Publish /p:RuntimeIdentifiers=osx.10.11-x64`
-
->>>>>>> Responding to PR feedback