From 4c2a6d48ebe31718525320cf3afb49e8ab2c41d6 Mon Sep 17 00:00:00 2001
From: bicijinlian <bicijinlian@163.com>
Date: Sat, 7 Sep 2019 12:20:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 LinqStudy.Test/LinqToObject/WhereTest.cs | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/LinqStudy.Test/LinqToObject/WhereTest.cs b/LinqStudy.Test/LinqToObject/WhereTest.cs
index a42d55f..efed245 100644
--- a/LinqStudy.Test/LinqToObject/WhereTest.cs
+++ b/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()
         {