Fixing a merge conflict

Author: normesta

articles/storage/blobs/TOC.yml

@@ -1081,265 +1081,7 @@ items:
         href: ../scripts/storage-blobs-container-delete-by-prefix-cli.md
       - name: Azure Resource Graph queries
         href: ../common/resource-graph-samples.md
-<<<<<<< HEAD
 - name: Data Lake Storage
-=======
-  - name: Reference
-    items:
-    - name: Blob Storage APIs
-      items:
-      - name: APIs for data access
-        items:
-        - name: REST API
-          href: /rest/api/storageservices/blob-service-rest-api
-        - name: .NET SDK
-          href: /dotnet/api/overview/azure/storage
-        - name: Java SDK
-          href: /java/api/overview/azure/storage
-        - name: Python SDK
-          href: /python/api/overview/azure/storage
-        - name: JavaScript SDK
-          href: /javascript/api/overview/azure/storage
-      - name: APIs for resource management
-        items:
-        - name: REST API
-          href: /rest/api/storagerp/
-        - name: .NET SDK
-          href: /dotnet/api/overview/azure/resourcemanager.storage-readme
-        - name: Java SDK
-          href: /java/api/overview/azure/storage/management
-        - name: Python SDK
-          href: /python/api/overview/azure/storage#management
-        - name: JavaScript SDK
-          href: /javascript/api/overview/azure/storage#management
-      - name: Spring Cloud Azure
-        href: /azure/developer/java/spring-framework/spring-cloud-azure?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json#resource-handing
-    - name: Data Lake Storage Gen2 APIs
-      items:
-      - name: REST
-        href: /rest/api/storageservices/data-lake-storage-gen2
-      - name: .NET
-        href: /dotnet/api/azure.storage.files.datalake
-      - name: Java
-        href: /java/api/overview/azure/storage-file-datalake-readme
-      - name: Python
-        href: /python/api/overview/azure/storage-file-datalake-readme
-      - name: JavaScript
-        href: /javascript/api/overview/azure/storage-file-datalake-readme
-      - name: C++
-        href: https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/storage/azure-storage-files-datalake
-    - name: Query acceleration reference
-      href: query-acceleration-sql-reference.md
-    - name: AzCopy v10
-      items:
-      - name: Configuration settings
-        href: ../common/storage-ref-azcopy-configuration-settings.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
-      - name: Error codes
-        href: ../common/storage-ref-azcopy-error-codes.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
-      - name: azcopy
-        href: ../common/storage-ref-azcopy.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
-      - name: azcopy bench
-        href: ../common/storage-ref-azcopy-bench.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
-      - name: azcopy copy
-        href: ../common/storage-ref-azcopy-copy.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
-      - name: azcopy doc
-        href: ../common/storage-ref-azcopy-doc.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
-      - name: azcopy env
-        href: ../common/storage-ref-azcopy-env.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
-      - name: azcopy jobs
-        href: ../common/storage-ref-azcopy-jobs.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
-      - name: azcopy jobs clean
-        href: ../common/storage-ref-azcopy-jobs-clean.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
-      - name: azcopy jobs list
-        href: ../common/storage-ref-azcopy-jobs-list.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
-      - name: azcopy jobs remove
-        href: ../common/storage-ref-azcopy-jobs-remove.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
-      - name: azcopy jobs resume
-        href: ../common/storage-ref-azcopy-jobs-resume.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
-      - name: azcopy jobs show
-        href: ../common/storage-ref-azcopy-jobs-show.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
-      - name: azcopy list
-        href: ../common/storage-ref-azcopy-list.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
-      - name: azcopy login
-        href: ../common/storage-ref-azcopy-login.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
-      - name: azcopy login status
-        href: ../common/storage-ref-azcopy-login-status.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
-      - name: azcopy logout
-        href: ../common/storage-ref-azcopy-logout.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
-      - name: azcopy make
-        href: ../common/storage-ref-azcopy-make.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
-      - name: azcopy remove
-        href: ../common/storage-ref-azcopy-remove.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
-      - name: azcopy sync
-        href: ../common/storage-ref-azcopy-sync.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
-      - name: azcopy set-properties
-        href: ../common/storage-ref-azcopy-set-properties.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
-    - name: BlobFuse2
-      items:
-      - name: Configure settings
-        href: blobfuse2-configuration.md?toc=/azure/storage/blobs/toc.json
-      - name: Commands
-        items:
-        - name: The BlobFuse2 command set
-          href: blobfuse2-commands.md?toc=/azure/storage/blobs/toc.json
-        - name: BlobFuse2 mount
-          href: blobfuse2-commands-mount.md?toc=/azure/storage/blobs/toc.json
-          items:
-          - name: BlobFuse2 mount all
-            href: blobfuse2-commands-mount-all.md?toc=/azure/storage/blobs/toc.json
-          - name: BlobFuse2 mount list
-            href: blobfuse2-commands-mount-list.md?toc=/azure/storage/blobs/toc.json
-        - name: BlobFuse2 mountv1
-          href: blobfuse2-commands-mountv1.md?toc=/azure/storage/blobs/toc.json
-        - name: BlobFuse2 unmount
-          href: blobfuse2-commands-unmount.md?toc=/azure/storage/blobs/toc.json
-          items:
-          - name: BlobFuse2 unmount all
-            href: blobfuse2-commands-unmount-all.md?toc=/azure/storage/blobs/toc.json
-        - name: BlobFuse2 completion
-          href: blobfuse2-commands-completion.md?toc=/azure/storage/blobs/toc.json
-          items:
-          - name: BlobFuse2 completion bash
-            href: blobfuse2-commands-completion-bash.md?toc=/azure/storage/blobs/toc.json
-          - name: BlobFuse2 completion fish
-            href: blobfuse2-commands-completion-fish.md?toc=/azure/storage/blobs/toc.json
-          - name: BlobFuse2 completion PowerShell
-            href: blobfuse2-commands-completion-powershell.md?toc=/azure/storage/blobs/toc.json
-          - name: BlobFuse2 completion zsh
-            href: blobfuse2-commands-completion-zsh.md?toc=/azure/storage/blobs/toc.json
-        - name: BlobFuse2 secure
-          href: blobfuse2-commands-secure.md?toc=/azure/storage/blobs/toc.json
-          items:
-          - name: BlobFuse2 secure encrypt
-            href: blobfuse2-commands-secure-encrypt.md?toc=/azure/storage/blobs/toc.json
-          - name: BlobFuse2 secure decrypt
-            href: blobfuse2-commands-secure-decrypt.md?toc=/azure/storage/blobs/toc.json
-          - name: BlobFuse2 secure get
-            href: blobfuse2-commands-secure-get.md?toc=/azure/storage/blobs/toc.json
-          - name: BlobFuse2 secure set
-            href: blobfuse2-commands-secure-set.md?toc=/azure/storage/blobs/toc.json
-        - name: BlobFuse2 version
-          href: blobfuse2-commands-version.md?toc=/azure/storage/blobs/toc.json
-        - name: BlobFuse2 help
-          href: blobfuse2-commands-help.md?toc=/azure/storage/blobs/toc.json
-    - name: Resource Manager template
-      displayName: ARM
-      href: /azure/templates/microsoft.storage/allversions
-    - name: Monitoring data
-      href: monitor-blob-storage-reference.md
-    - name: Host keys (SFTP) support
-      href: secure-file-transfer-protocol-host-keys.md
-    - name: Azure Policy built-ins
-      displayName: samples, policies, definitions
-      href: ../common/policy-reference.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
-  - name: Resources
-    items:
-    - name: FAQ
-      href: storage-blob-faq.yml
-    - name: Azure updates
-      href: https://azure.microsoft.com/updates/?product=storage
-    - name: Azure Storage Explorer
-      items:
-      - name: Download Storage Explorer
-        href: https://azure.microsoft.com/features/storage-explorer/
-      - name: Get started with Storage Explorer
-        href: ../storage-explorer/vs-azure-tools-storage-manage-with-storage-explorer.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
-      - name: Sign in to Storage Explorer
-        href: ../common/storage-explorer-sign-in.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
-      - name: Storage Explorer networking
-        href: ../common/storage-explorer-network.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
-      - name: Storage Explorer release notes
-        href: https://github.com/microsoft/AzureStorageExplorer/releases
-      - name: Troubleshoot Storage Explorer
-        href: /troubleshoot/azure/azure-storage/storage-explorer-troubleshooting?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
-      - name: Connect an emulator to Storage Explorer
-        href: ../common/storage-explorer-emulators.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
-      - name: Storage Explorer command line options
-        href: ../common/storage-explorer-command-line-options.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
-      - name: Storage Explorer direct link
-        href: ../common/storage-explorer-direct-link.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
-      - name: Storage Explorer security
-        href: ../common/storage-explorer-security.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
-      - name: Storage Explorer soft delete
-        href: ../common/storage-explorer-soft-delete.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
-      - name: Storage Explorer blob versioning
-        href: ../common/storage-explorer-blob-versioning.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
-      - name: Storage Explorer manage Azure Blob storage
-        href: ../storage-explorer/vs-azure-tools-storage-explorer-blobs.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
-      - name: Storage Explorer create file shares
-        href: ../storage-explorer/vs-azure-tools-storage-explorer-files.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
-      - name: Storage Explorer support policy and lifecycle
-        href: ../common/storage-explorer-support-policy-lifecycle.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
-      - name: Storage Explorer accessibility
-        href: ../storage-explorer/vs-azure-tools-storage-explorer-accessibility.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
-    - name: Blob storage on Microsoft Q&A
-      href: /answers/topics/azure-blob-storage.html
-    - name: Blob storage on Stack Overflow
-      href: https://stackoverflow.com/questions/tagged/azure-blob-storage
-    - name: Pricing for block blobs
-      href: https://azure.microsoft.com/pricing/details/storage/blobs/
-    - name: Pricing for data lake storage
-      href: https://azure.microsoft.com/pricing/details/storage/data-lake/
-    - name: Pricing for page blobs
-      href: https://azure.microsoft.com/pricing/details/storage/page-blobs/
-    - name: Azure pricing calculator
-      href: https://azure.microsoft.com/pricing/calculator/
-    - name: Videos
-      href: https://azure.microsoft.com/documentation/videos/index/?services=storage
-    - name: Compare access with NFS to Azure Blob Storage, Azure Files, and Azure NetApp Files
-      href: ../common/nfs-comparison.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
-    - name: NuGet packages (.NET)
-      items:
-      - name: Microsoft.Azure.Storage.Common (version 11.x)
-        href: https://www.nuget.org/packages/Microsoft.Azure.Storage.Common/
-      - name: Azure.Storage.Common (version 12.x)
-        href: https://www.nuget.org/packages/Azure.Storage.Common/
-      - name: Microsoft.Azure.Storage.Blob (version 11.x)
-        href: https://www.nuget.org/packages/Microsoft.Azure.Storage.Blob/
-      - name: Azure.Storage.Blob (version 12.x)
-        href: https://www.nuget.org/packages/Azure.Storage.Blobs/
-      - name: Azure Configuration Manager
-        href: https://www.nuget.org/packages/Microsoft.Azure.ConfigurationManager/
-      - name: Azure Storage Data Movement library
-        href: https://www.nuget.org/packages/Microsoft.Azure.Storage.DataMovement/
-      - name: Storage Resource Provider library
-        href: https://www.nuget.org/packages/Microsoft.Azure.Management.Storage/
-    - name: Source code
-      items:
-      - name: .NET
-        items:
-        - name: Azure Storage client library
-          items:
-          - name: Version 12.x
-            href: https://github.com/Azure/azure-sdk-for-net/tree/master/sdk/storage
-          - name: Version 11.x and earlier
-            href: https://github.com/Azure/azure-storage-net
-        - name: Data Movement library
-          href: https://github.com/Azure/azure-storage-net-data-movement
-        - name: Storage Resource Provider library
-          href: https://github.com/Azure/azure-sdk-for-net/tree/master/sdk/storage/Microsoft.Azure.Management.Storage
-      - name: Java
-        items:
-        - name: Azure Storage client library version 12.x
-          href: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/storage
-        - name: Azure Storage client library version 8.x and earlier
-          href: https://github.com/Azure/azure-storage-java
-      - name: Node.js
-        items:
-        - name: Azure Storage client library version 12.x
-          href: https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/storage
-        - name: Azure Storage client library version 10.x
-          href: https://github.com/Azure/azure-storage-node
-      - name: Python
-        items:
-        - name: Azure Storage client library version 12.x
-          href: https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/storage
-        - name: Azure Storage client library version 2.1
-          href: https://github.com/Azure/azure-storage-python
-    - name: Compliance offerings
-      href: ../common/storage-compliance-offerings.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
-- name: Data Lake Storage Gen2
->>>>>>> 2d290ff50fc2b88a9f4a835eea3b48d30fe16edb
   items:
   - name: Overview
     items:
@@ -1742,8 +1484,5 @@ items:
         href: https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/storage
       - name: Azure Storage client library version 2.1
         href: https://github.com/Azure/azure-storage-python
-  - name: Code samples using deprecated SDKs
-    items:
-    - name: .NET
   - name: Compliance offerings
     href: ../common/storage-compliance-offerings.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json