merge conflict

source/chapter2/21_Protocols.md

@@ -34,6 +34,10 @@ protocol SomeProtocol {
 	// 协议内容
 }
 ```
+<<<<<<< HEAD
+=======
+
+>>>>>>> 698efafc26795151faeb79f5a98eab5a58d5721e
 
 在类，结构体，枚举的名称后加上`协议名称`，中间以冒号`:`分隔即可实现协议；实现多个协议时，各协议之间用逗号`,`分隔，如下所示：
 
@@ -98,10 +102,17 @@ 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"
@@ -211,10 +222,17 @@ 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
 }
 ```
 
@@ -716,3 +734,8 @@ for _ in 1...5 {
 // 0
 // 0
 ```
+<<<<<<< HEAD
+=======
+
+preview
+>>>>>>> 698efafc26795151faeb79f5a98eab5a58d5721e

source/chapter2/23_Advanced_Operators.md

@@ -485,4 +485,9 @@ let plusMinusVector = firstVector +- secondVector
 // plusMinusVector 此时的值为 (4.0, -2.0)
 ```
 
+<<<<<<< HEAD
 这个运算符把两个向量的`x`相加，把向量的`y`相减。因为他实际是属于加减运算，所以让它保持了和加法一样的结合性和优先级(`left`和`140`)。查阅完整的Swift默认结合性和优先级的设置，请移步[表达式](../chapter3/04_Expressions.html);
+=======
+这个运算符把两个向量的`x`相加，把向量的`y`相减。因为他实际是属于加减运算，所以让它保持了和加法一样的结合性和优先级(`left`和`140`)。查阅完整的Swift默认结合性和优先级的设置，请移步[表达式](../chapter3/04_Expressions.html);
+
+>>>>>>> 698efafc26795151faeb79f5a98eab5a58d5721e

source/chapter3/04_Expressions.md

@@ -596,7 +596,10 @@ someInstance.dynamicType.printClassName（）
 
 关于subscript的声明，请参见： Protocol Subscript Declaration.
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> 698efafc26795151faeb79f5a98eab5a58d5721e
 > 附属脚本表达式语法  
 > *附属脚本表达式* → [*后置表达式*](..\chapter3\04_Expressions.html#postfix_expression) **[** [*表达式列表*](..\chapter3\04_Expressions.html#expression_list) **]**