From 2a91395259fef5f6f1cf2dd2211eea5cb101215d 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 | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/source/chapter2/16_Automatic_Reference_Counting.md b/source/chapter2/16_Automatic_Reference_Counting.md
index 56bbc30c..f4767f16 100644
--- a/source/chapter2/16_Automatic_Reference_Counting.md
+++ b/source/chapter2/16_Automatic_Reference_Counting.md
@@ -65,9 +65,5 @@ Person类有一个构造函数，此构造函数为实例的name属性赋值并
 		reference3 = reference1
 
 现在这个Person类实例已经有三个强引用了。
-<<<<<<< HEAD
-=======
 
 (未完待续)
->>>>>>> add ARC content
-