Fix build issue

johnml1135 · johnml1135 · commit d5ae8e7840ed · 2026-03-16T17:45:19.000-04:00
diff --git a/build.ps1 b/build.ps1
@@ -480,13 +480,10 @@ try {
 		if ($SkipNative) {
 			$finalMsBuildArgs += "/p:SkipNative=true"
 		}
-<<<<<<< HEAD
-=======
 		if ($ManagedDebugType) {
 			$finalMsBuildArgs += "/p:DebugSymbols=true"
 			$finalMsBuildArgs += "/p:DebugType=$ManagedDebugType"
 		}
->>>>>>> b25ed3833 (Add local LCM source mode workflow)
 
 		$installerMsBuildArgs = $finalMsBuildArgs
 

Original file line number	Diff line number	Diff line change
`@@ -480,13 +480,10 @@ try {`
`480`	`480`	`if ($SkipNative) {`
`481`	`481`	`$finalMsBuildArgs += "/p:SkipNative=true"`
`482`	`482`	`}`
`483`		`-<<<<<<< HEAD`
`484`		`-=======`
`485`	`483`	`if ($ManagedDebugType) {`
`486`	`484`	`$finalMsBuildArgs += "/p:DebugSymbols=true"`
`487`	`485`	`$finalMsBuildArgs += "/p:DebugType=$ManagedDebugType"`
`488`	`486`	`}`
`489`		`->>>>>>> b25ed3833 (Add local LCM source mode workflow)`
`490`	`487`
`491`	`488`	`$installerMsBuildArgs = $finalMsBuildArgs`
`492`	`489`