Skip to content

Commit 378aab8

Browse files
committed
remove stray character
1 parent ce9dc40 commit 378aab8

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

articles/azure-netapp-files/whats-new.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ Azure NetApp Files is updated regularly. This article provides a summary about t
152152
* Azure Managed Disk as an alternate storage back end
153153

154154
* [Active Directory connection enhancement: Reset Active Directory computer account password](create-active-directory-connections.md#reset-active-directory) (Preview)
155-
>>>>>>> 15252d24ac8fc6f9c2853c1a0deeb10d3393f104
156155

157156
## June 2022
158157

0 commit comments

Comments
 (0)