Skip to content

Commit 2f0c737

Browse files
committed
fixing merge conflicts
1 parent 62400c5 commit 2f0c737

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

articles/trusted-signing/how-to-signing-integrations.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@ author: microsoftshawarma #Required; your GitHub user alias, with correct capita
55
ms.author: rakiasegev #Required; microsoft alias of author; optional team alias.
66
ms.service: azure-code-signing #Required; service per approved list. slug assigned by ACOM.
77
ms.topic: how-to #Required; leave this attribute/value as-is.
8-
<<<<<<< HEAD
9-
ms.date: 03/31/2024 #Required; mm/dd/yyyy format.
10-
=======
118
ms.date: 04/04/2024 #Required; mm/dd/yyyy format.
12-
>>>>>>> 46436ab4cb7246da4125502a36412d301321083b
139
ms.custom: template-how-to-pattern #Required; leave this attribute/value as-is.
1410
---
1511

0 commit comments

Comments
 (0)