Merge pull request #35409 from nate-chandler/wrangle/73049300/release/5.4

nate-chandler · web-flow · commit 88560dfe6607 · 2021-01-13T08:52:49.000-08:00
[Test] Temporarily disabled Runtime/protocol_conformance_collision.swift
diff --git a/test/Runtime/protocol_conformance_collision.swift b/test/Runtime/protocol_conformance_collision.swift
@@ -16,6 +16,8 @@
 
 // UNSUPPORTED: use_os_stdlib
 
+// REQUIRES: rdar73049300
+
 import Accelerate
 import Foundation
 import StdlibUnittest
