fix: resolve merge confl

smartysanthosh · smartysanthosh · commit 2aed4b84c5d7 · 2026-01-07T08:11:57.000-08:00
Signed-off-by: Santhosh Reddy Vootukuri (SUNNY) &lt;nagavo@microsoft.com&gt;
diff --git a/src/Microcks.Testcontainers/Helpers/MacOSHelper.cs b/src/Microcks.Testcontainers/Helpers/MacOSHelper.cs
@@ -37,8 +37,8 @@ public static class MacOSHelper
 
     /// <summary>
     /// Get Java options for MacOS M4 to fix SIGILL error.
+    /// Note: This is a temporary fix.
     /// </summary>
-    /// <returns></returns>
     public static IReadOnlyDictionary<string, string> GetJavaOptions(string keyname = "JAVA_OPTIONS")
     {
         if (IsMacOS)

Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,8 @@ public static class MacOSHelper`
`37`	`37`
`38`	`38`	`/// <summary>`
`39`	`39`	`/// Get Java options for MacOS M4 to fix SIGILL error.`
	`40`	`+ /// Note: This is a temporary fix.`
`40`	`41`	`/// </summary>`
`41`		`- /// <returns></returns>`
`42`	`42`	`public static IReadOnlyDictionary<string, string> GetJavaOptions(string keyname = "JAVA_OPTIONS")`
`43`	`43`	`{`
`44`	`44`	`if (IsMacOS)`