File tree Expand file tree Collapse file tree 1 file changed +0
-9
lines changed
src/Components/Web.JS/src/Platform/Mono Expand file tree Collapse file tree 1 file changed +0
-9
lines changed Original file line number Diff line number Diff line change @@ -288,12 +288,6 @@ function createEmscriptenModuleInstance(resourceLoader: WebAssemblyResourceLoade
288288
289289 if ( icuDataResource ) {
290290 loadICUData ( icuDataResource ) ;
291- < < < << << HEAD
292- } else {
293- // Use invariant culture if the app does not carry icu data.
294- MONO . mono_wasm_setenv ( "DOTNET_SYSTEM_GLOBALIZATION_INVARIANT" , "1" ) ;
295- = === ===
296- >>> >>> > internal / internal / release / 5.0 - preview8
297291 }
298292
299293 // Fetch the assemblies and PDBs in the background, telling Mono to wait until they are loaded
@@ -388,15 +382,12 @@ function createEmscriptenModuleInstance(resourceLoader: WebAssemblyResourceLoade
388382 // Turn off full-gc to prevent browser freezing.
389383 const mono_wasm_enable_on_demand_gc = cwrap ( 'mono_wasm_enable_on_demand_gc' , null , [ 'number' ] ) ;
390384 mono_wasm_enable_on_demand_gc ( 0 ) ;
391- < < < << << HEAD
392- = === ===
393385
394386 let timeZone = "UTC" ;
395387 try {
396388 timeZone = Intl . DateTimeFormat ( ) . resolvedOptions ( ) . timeZone ;
397389 } catch { }
398390 MONO . mono_wasm_setenv ( "TZ" , timeZone ) ;
399- > >>> >>> internal / internal / release / 5.0 - preview8
400391 const load_runtime = cwrap ( 'mono_wasm_load_runtime' , null , [ 'string' , 'number' ] ) ;
401392 // -1 enables debugging with logging disabled. 0 disables debugging entirely.
402393 load_runtime ( appBinDirName , hasDebuggingEnabled ( ) ? - 1 : 0 ) ;
You can’t perform that action at this time.
0 commit comments