Update azure.yml

b2fbe03c · Daniel Scholl · 8debfc82 · b2fbe03c
Commit b2fbe03c authored May 26, 2020 by Daniel Scholl
--- a/cloud-providers/azure.yml
+++ b/cloud-providers/azure.yml
@@ -68,11 +68,8 @@
    PUBSUB_TOKEN: az
    DEPLOY_ENV: empty
    # Indexer & Search Section
-<<<<<<< HEAD
    SEARCH_HOST: https://${AZURE_BASENAME_21}-au-search.azurewebsites.net/api/search/v2/
-=======
    aad_client_id: $AZURE_APP_ID
->>>>>>> master
    STORAGE_HOST: https://${AZURE_BASENAME_21}-au-storage.azurewebsites.net/
    aad_client_id: $AZURE_APP_ID
    DEFAULT_DATA_PARTITION_ID_TENANT1: opendes