解决冲突

LinqStudy.Test/LinqToObject/WhereTest.cs

@@ -1,4 +1,3 @@
-<<<<<<< .mine
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -14,25 +13,6 @@ namespace LinqStudy.Test.LinqToObject
     /// </summary>
     public class WhereTest
     {
-
-=======
-using System;
-using System.Linq;
-using System.Collections;
-using System.Collections.Generic;
-
-using Xunit;
-
-namespace LinqStudy.Test.LinqToObject
-{
-
-    /// <summary>
-    /// 选件筛选
-    /// </summary>
-    public class WhereTest
-    {
-        /// <summary>
->>>>>>> .theirs
         [Fact]
         public void Where_Test()
         {