4 changes that move the abac storage files from common to blobs

Author: jimmart-dev

.openpublishing.redirection.json

@@ -95,11 +95,19 @@ items:
     - name: Add role assignment conditions
       items:
       - name: Portal
+<<<<<<< HEAD
         href: ../common/storage-auth-abac-portal.md?toc=/azure/storage/blobs/toc.json
       - name: PowerShell
         href: ../common/storage-auth-abac-powershell.md?toc=/azure/storage/blobs/toc.json
       - name: CLI
         href: ../common/storage-auth-abac-cli.md?toc=/azure/storage/blobs/toc.json
+=======
+        href: storage-auth-abac-portal.md
+      - name: PowerShell
+        href: storage-auth-abac-powershell.md
+      - name: CLI
+        href: storage-auth-abac-cli.md
+>>>>>>> d0a4bac8e420 (moved blob abac files to blobs dir")
   - name: Samples
     items:
     - name: .NET
@@ -148,13 +156,13 @@ items:
           - name: Authorize with Azure roles
             href: authorize-access-azure-active-directory.md
           - name: Authorize with conditions
-            href: ../common/storage-auth-abac.md?toc=/azure/storage/blobs/toc.json
+            href: storage-auth-abac.md?toc=%2fazure%2fstorage%2fblobs%2ftoc.json
           - name: Actions and attributes for conditions
-            href: ../common/storage-auth-abac-attributes.md?toc=/azure/storage/blobs/toc.json
+            href: storage-auth-abac-attributes.md
           - name: Security for conditions
-            href: ../common/storage-auth-abac-security.md?toc=/azure/storage/blobs/toc.json
+            href: storage-auth-abac-security.md
           - name: Example conditions
-            href: ../common/storage-auth-abac-examples.md?toc=/azure/storage/blobs/toc.json
+            href: storage-auth-abac-examples.md
         - name: Authorize with Shared Key
           href: /rest/api/storageservices/authorize-with-shared-key
         - name: Delegate access with shared access signatures (SAS)