Merge branch 'main' into user/lemccomb/adoport3

Signed-off-by: lemccomb <117306942+lemccomb@users.noreply.github.com>
microsoft · Sep 29, 2023 · f050301 · f050301
2 parents 822ded7 + 5c0e6b9
commit f050301
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -34,7 +34,6 @@
 
 **Merged pull requests:**
 
-
 - see if commit from web is more reliable [\#40](https://github.com/microsoft/CoseSignTool/pull/40) ([lemccomb](https://github.com/lemccomb))
 - another release test [\#39](https://github.com/microsoft/CoseSignTool/pull/39) ([lemccomb](https://github.com/lemccomb))
 - build and test only on PR [\#38](https://github.com/microsoft/CoseSignTool/pull/38) ([lemccomb](https://github.com/lemccomb))

diff --git a/CoseSignTool/CoseSign1/Interfaces/Constants.cs b/CoseSignTool/CoseSign1/Interfaces/Constants.cs
@@ -13,3 +13,4 @@ public static class Constants
     /// </summary>
     public const string DEFAULT_CONTENT_TYPE = "application/cose";
 }
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,3 +13,4 @@ public static class Constants
		/// </summary>
		public const string DEFAULT_CONTENT_TYPE = "application/cose";
		}