From 55bd47a9b1609631b97a3f1756331a1fe7c635b8 Mon Sep 17 00:00:00 2001
From: Jax Wu <bignerdcoding@gmail.com>
Date: Tue, 26 Mar 2019 15:14:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8E=9F=E6=9C=89=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=86=B2=E7=AA=81=E6=A0=87=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/chapter2/25_Access_Control.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/source/chapter2/25_Access_Control.md b/source/chapter2/25_Access_Control.md
index 5254094d..35e887b2 100644
--- a/source/chapter2/25_Access_Control.md
+++ b/source/chapter2/25_Access_Control.md
@@ -207,11 +207,7 @@ public enum CompassPoint {
 
 ```swift
 public class A {
-<<<<<<< HEAD
-    private func someMethod() {}
-=======
     fileprivate func someMethod() {}
->>>>>>> /25_Access_Control 修正标点使用，更新代码
 }
 
 internal class B: A {