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

merge 2.21,3.5 confilicts

Browse Source
This commit is contained in:
stanzhai
2014-06-14 22:30:44 +08:00
parent 460bd5968b
commit e1e1c5abbc
2 changed files with 0 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/chapter2/21_Protocols.md
View File

@ -98,17 +98,10 @@ class Starship: FullyNamed {
init(name: String, prefix: String? = nil ) {
self.anme = name
self.prefix = prefix
<<<<<<< HEAD
}
var fullName: String {
return (prefix ? prefix ! + " " : " ") + name
}
=======
}
var fullName: String {
return (prefix ? prefix ! + " " : " ") + name
}
>>>>>>> 698efafc26795151faeb79f5a98eab5a58d5721e
}
var ncc1701 = Starship(name: "Enterprise", prefix: "USS")
// ncc1701.fullName == "USS Enterprise"
@ -218,17 +211,10 @@ class Dice {
init(sides: Int, generator: RandomNumberGenerator) {
self.sides = sides
self.generator = generator
<<<<<<< HEAD
}
func roll() -> Int {
return Int(generator.random() * Double(sides)) +1
}
=======
}
func roll() -> Int {
return Int(generator.random() * Double(sides)) +1
}
>>>>>>> 698efafc26795151faeb79f5a98eab5a58d5721e
}
```
@ -730,8 +716,3 @@ for _ in 1...5 {
// 0
// 0
```
<<<<<<< HEAD
=======
preview
>>>>>>> 698efafc26795151faeb79f5a98eab5a58d5721e