andre/the-swift-programming-language-in-chinese
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #896 from BigNerdCoding/fixConflict

Browse Source 
修复原有文件冲突标示
This commit is contained in:
Jax Wu
2019-03-26 15:41:06 +08:00
committed by GitHub
parent 582d450a75 55bd47a9b1
commit 6a881a91db
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/chapter2/25_Access_Control.md
View File

@ -207,11 +207,7 @@ public enum CompassPoint {
```swift ```swift
public class A { public class A {
<<<<<<< HEAD
private func someMethod() {}
=======
fileprivate func someMethod() {} fileprivate func someMethod() {}
>>>>>>> /25_Access_Control 修正标点使用，更新代码
} }
internal class B: A { internal class B: A {