[Lldb-commits] [lldb] [lldb] Introduce ScriptedFrameProvider for real threads (PR #161870)

[via lldb-commits]

================
@@ -1336,8 +1338,18 @@ class Thread : public std::enable_shared_from_this<Thread>,
     return StructuredData::ObjectSP();
   }
 
+<<<<<<< HEAD
----------------
jimingham wrote:

Would this go away if I wasn't looking at the patches one by one?

https://github.com/llvm/llvm-project/pull/161870