merge 2.21,2.23,3.5 confilicts

2014-06-14 22:27:05 +08:00
parent 1f534a713d
commit 460bd5968b
3 changed files with 0 additions and 13 deletions
--- a/source/chapter3/04_Expressions.md
+++ b/source/chapter3/04_Expressions.md
@ -596,10 +596,6 @@ someInstance.dynamicType.printClassName（）

 关于subscript的声明，请参见： Protocol Subscript Declaration.

-<<<<<<< HEAD
-
-=======
->>>>>>> 698efafc26795151faeb79f5a98eab5a58d5721e
 > 附属脚本表达式语法  
 > *附属脚本表达式* → [*后置表达式*](..\chapter3\04_Expressions.html#postfix_expression) **[** [*表达式列表*](..\chapter3\04_Expressions.html#expression_list) **]**