add ARC content

2014-06-05 23:43:13 +08:00
parent 56697ddf56
commit 6620d5c19b
1 changed files with 5 additions and 0 deletions
--- a/source/chapter2/16_Automatic_Reference_Counting.md
+++ b/source/chapter2/16_Automatic_Reference_Counting.md
@ -65,4 +65,9 @@ Person类有一个构造函数，此构造函数为实例的name属性赋值并
 		reference3 = reference1

 现在这个Person类实例已经有三个强引用了。
+<<<<<<< HEAD
+=======
+
+(未完待续)
+>>>>>>> add ARC content