From 6620d5c19bb3546b122d63a695baf7c14b09b38a Mon Sep 17 00:00:00 2001
From: Timothy <yexiaozhou2003@gmail.com>
Date: Thu, 5 Jun 2014 23:43:13 +0800
Subject: [PATCH] add ARC content

---
 source/chapter2/16_Automatic_Reference_Counting.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/source/chapter2/16_Automatic_Reference_Counting.md b/source/chapter2/16_Automatic_Reference_Counting.md
index 130e0d5b..56bbc30c 100644
--- 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