Missed a small merge conflict

nahk-ivanov · Jul 14, 2024 · 2c75a78 · 2c75a78
1 parent 30cced2
commit 2c75a78
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/YamlDotNet.Test/Serialization/DeserializerTest.cs b/YamlDotNet.Test/Serialization/DeserializerTest.cs
@@ -527,8 +527,6 @@ public interface IModelSpec
 
             string DriveType { get; }
         }
-<<<<<<< HEAD
-=======
 
         public class Conference
         {
@@ -549,6 +547,5 @@ public class Session
 
             public Attendee Greeter { get; private set; }
         }
->>>>>>> 760472fd76aaa7c359336e7dc17b268fe010f4bd
     }
 }