Skip to content

Commit 70e297d

Browse files
Dirty PR
1 parent f63b659 commit 70e297d

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

articles/backup/index.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,8 @@ metadata:
1111
ms.topic: landing-page
1212
author: AbhishekMallick-MS
1313
ms.author: v-abhmallick
14-
<<<<<<< HEAD
15-
ms.date: 09/25/2023
16-
=======
17-
ms.date: 09/11/2023
14+
ms.date: 09/29/2023
1815

19-
>>>>>>> abec388d599863689aea85c8b61275cb0d290de1
2016
# linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | video | whats-new
2117

2218
landingContent:
@@ -66,17 +62,14 @@ landingContent:
6662
linkLists:
6763
- linkListType: whats-new
6864
links:
69-
<<<<<<< HEAD
7065
- text: Multiple backups per day for Azure VMs
7166
url: backup-azure-vms-enhanced-policy.md
7267
- text: Multi-user authorization for Backup vault
7368
url: multi-user-authorization-concept.md?tabs=backup-vault
74-
=======
7569
- text: Enhanced soft delete
7670
url: backup-azure-enhanced-soft-delete-about.md
7771
- text: Azure Kubernetes Service backup (preview)
7872
url: azure-kubernetes-service-backup-overview.md
79-
>>>>>>> abec388d599863689aea85c8b61275cb0d290de1
8073
- text: Azure Blob vaulted backups (preview)
8174
url: blob-backup-overview.md
8275
- text: Selective Disk backup with Enhanced policy for Azure VM (preview)

0 commit comments

Comments
 (0)