Update azure.yml

cloud-providers/azure.yml

@@ -125,11 +125,8 @@ azure_debug:
     echo "export ENTITLEMENT_URL=\"$ENTITLEMENT_URL\""
     echo "export LEGAL_URL=\"$LEGAL_URL\""
     echo "export STORAGE_URL=\"$STORAGE_URL\""
-<<<<<<< HEAD
     echo "export SEARCH_URL=\"$SEARCH_URL\""
     echo "export INDEXER_URL=\"$INDEXER_URL\""
-=======
->>>>>>> master
     echo "export INTEGRATION_TESTER=\"\$AZURE_PRINCIPAL_ID\""
     echo "export AZURE_TESTER_SERVICEPRINCIPAL_SECRET=\"\$AZURE_PRINCIPAL_SECRET\""
     echo "export AZURE_AD_APP_RESOURCE_ID=\"$AZURE_AD_APP_RESOURCE_ID\""