chore: Merge conflict resolution in README (#306)

Author: nschonni

README.md

@@ -18,22 +18,15 @@ NOTE: you must have write permissions to the repository in question. If you're u
 
 ## Dependencies on other GitHub Actions
 
-<<<<<<< HEAD
-* [Checkout](https://github.com/actions/checkout) Checkout your Git repository content into GitHub Actions agent.
-=======
 * [Checkout](https://github.com/actions/checkout) your Git repository content into GitHub Actions agent.
->>>>>>> origin/master
 * Authenticate using [Azure Web App Publish Profile](https://github.com/projectkudu/kudu/wiki/Deployment-credentials#site-credentials-aka-publish-profile-credentials) or using the [Azure Login Action](https://github.com/Azure/login). Examples of both are given later in this article.
 
     The action supports using publish profile for [Azure Web Apps](https://azure.microsoft.com/services/app-service/web/) (both Windows and Linux) and [Azure Web Apps for Containers](https://azure.microsoft.com/services/app-service/containers/) (both Windows and Linux).
 
  **Note: As of October 2020, Linux web apps will need the app setting `WEBSITE_WEBDEPLOY_USE_SCM` set to `true` before downloading the publish profile from the portal. This requirement will be removed in the future.**
 
     The action does not support multi-container scenario with publish profile.
-<<<<<<< HEAD
-=======
 * Enable [Run from Package](https://docs.microsoft.com/en-us/azure/app-service/deploy-run-package#enable-running-from-package), otherwise remote build will take time and the deployment will take longer. 
->>>>>>> origin/master
 
 * To build app code in a specific language based environment, use setup actions:
   * [Setup DotNet](https://github.com/actions/setup-dotnet) Sets up a dotnet environment by optionally downloading and caching a version of dotnet by SDK version and adding to PATH.