Merge branch 'master' of https://github.com/mosa/MOSA-Project into 51…

…1-safepoints # Conflicts: # Source/Mosa.Compiler.Framework/Stages/SafePointStage.cs
tgiphil · Dec 1, 2024 · 807de8d · 807de8d
1 parent 187caab
commit 807de8d
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/Source/Mosa.Compiler.Framework/Stages/SafePointStage.cs b/Source/Mosa.Compiler.Framework/Stages/SafePointStage.cs
@@ -6,11 +6,7 @@ namespace Mosa.Compiler.Framework.Stages;
 
 // TODO:
 // 1. Analyze method and determine:
-<<<<<<< HEAD
 //    A. Determine if method contains any references to objects, or have any managed pointers
-=======
-//    A. Determine if method contain any refernces to objects, or have any managed pointers
->>>>>>> d95db0ac4b68e28fc2e97b50da5bb5aebe7dabce
 //    B. Determine start/end ranges of objects and managed pointers on the local stack and parameters
 //    C. Place SafePoint at:
 //       i.  Method prologue