Merge pull request #896 from BigNerdCoding/fixConflict

修复原有文件冲突标示
2019-03-26 15:41:06 +08:00
parent 582d450a75 55bd47a9b1
commit 6a881a91db
1 changed files with 0 additions and 4 deletions
--- 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 {