Update azure-key-vault-sample-version-7.0.md

lilgreenbird · web-flow · commit 059494899253 · 2021-01-29T10:42:23.000-08:00
diff --git a/docs/connect/jdbc/azure-key-vault-sample-version-7.0.md b/docs/connect/jdbc/azure-key-vault-sample-version-7.0.md
@@ -1,11 +1,6 @@
 ---
-<<<<<<< HEAD
 description: "Azure Key Vault sample 7.0, 8.0"
 title: "Azure Key Vault sample 7.0, 8.0 | Microsoft Docs"
-=======
-description: "Azure Key Vault sample 7.0"
-title: "Azure Key Vault sample 7.0 | Microsoft Docs"
->>>>>>> 2e8c6be6ec99230dc991b9ee40711912ec06b600
 ms.custom: ""
 ms.date: "01/29/2021"
 ms.prod: sql
