resolve all conflict

2014-06-15 10:01:25 +08:00
parent 69bcca347a
commit c3a2c7bc48
2 changed files with 3 additions and 1 deletions
--- a/source/chapter2/15_Deinitialization.md
+++ b/source/chapter2/15_Deinitialization.md
@ -1,7 +1,6 @@
 > 翻译：bruce0505  
 > 校对：fd5788  

-
 # 析构过程（Deinitialization）
 ---------------------------