resolve merge conflict

b-ahibbard · b-ahibbard · commit f8c8e28fed99 · 2022-08-09T21:10:25.000-04:00
diff --git a/articles/azure-netapp-files/azure-netapp-files-network-topologies.md b/articles/azure-netapp-files/azure-netapp-files-network-topologies.md
@@ -12,11 +12,7 @@ ms.service: azure-netapp-files
 ms.workload: storage
 ms.tgt_pltfrm: na
 ms.topic: conceptual
-<<<<<<< HEAD
 ms.date: 08/10/2022
-=======
-ms.date: 08/08/2022
->>>>>>> 5cb377931efabee5060d90f01fba23e4a49f92c2
 ms.author: ramakk
 ---
 # Guidelines for Azure NetApp Files network planning
