================
@@ -1336,8 +1338,18 @@ class Thread : public std::enable_shared_from_this<Thread>,
return StructuredData::ObjectSP();
}
+<<<<<<< HEAD
----------------
medismailben wrote:
Yes
https://github.com/llvm/llvm-project/pull/161870