fix conflict

2014-06-07 21:06:00 +08:00
parent e2530f2d71 d6c8e3df65
commit 49f642c500
1 changed files with 0 additions and 1 deletions
--- a/source/chapter2/16_Automatic_Reference_Counting.md
+++ b/source/chapter2/16_Automatic_Reference_Counting.md
@ -65,5 +65,4 @@ Person类有一个构造函数，此构造函数为实例的name属性赋值并
 		reference3 = reference1

 现在这个Person类实例已经有三个强引用了。
-
 (未完待续)