Skip to content

Commit 4e89a8f

Browse files
committed
Resolve conflict
1 parent 8dd42b1 commit 4e89a8f

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

Sources/Testing/ABI/EntryPoints/EntryPoint.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,10 @@ func entryPoint(passing args: __CommandLineArguments_v0?, eventHandler: Event.Ha
5757
// Check for experimental console output flag
5858
if Environment.flag(named: "SWT_ENABLE_EXPERIMENTAL_CONSOLE_OUTPUT") == true {
5959
// Use experimental AdvancedConsoleOutputRecorder
60-
var advancedOptions = Event.AdvancedConsoleOutputRecorder<ABI.HighestVersion>.Options()
60+
var advancedOptions = Event.AdvancedConsoleOutputRecorder<ABI.ExperimentalVersion>.Options()
6161
advancedOptions.base = .for(.stderr)
62-
let eventRecorder = Event.AdvancedConsoleOutputRecorder<ABI.HighestVersion>(options: advancedOptions) { string in
62+
63+
let eventRecorder = Event.AdvancedConsoleOutputRecorder<ABI.ExperimentalVersion>(options: advancedOptions) { string in
6364
try? FileHandle.stderr.write(string)
6465
}
6566

0 commit comments

Comments
 (0)