merge conflict

2014-06-14 22:09:42 +08:00
parent 7c5cd7067c 698efafc26
commit 1f534a713d
3 changed files with 32 additions and 1 deletions
--- a/source/chapter3/04_Expressions.md
+++ b/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) **]**