From 4bee3f40f5650a356719a6b3de9e471df5a092d1 Mon Sep 17 00:00:00 2001
From: CyC2018 <1029579233@qq.com>
Date: Mon, 6 Aug 2018 00:17:57 +0800
Subject: [PATCH] auto commit

---
 notes/重构.md | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/notes/重构.md b/notes/重构.md
index abdd99bd..b5a834e0 100644
--- a/notes/重构.md
+++ b/notes/重构.md
@@ -107,11 +107,7 @@
     * [10. 塑造模板函数](#10-塑造模板函数)
     * [11. 以委托取代继承](#11-以委托取代继承)
     * [12. 以继承取代委托](#12-以继承取代委托)
-<<<<<<< HEAD
 * [重构练习](#重构练习)
-=======
-* [练习重构的栗子](#练习重构的栗子)    
->>>>>>> e6475eb3bca6dc610b1db681f91da9d266151e0a
 * [参考资料](#参考资料)
 <!-- GFM-TOC -->
 
@@ -1420,15 +1416,9 @@ public Manager(String name, String id, int grade) {
 
 让委托类继承受托类。
 
-<<<<<<< HEAD
 # 重构练习
 
 - [Refactoring Kata](https://github.com/aikin/refactoring-kata)
-=======
-
-# 练习重构的栗子
-* [Refactoring Kata](https://github.com/aikin/refactoring-kata)
->>>>>>> e6475eb3bca6dc610b1db681f91da9d266151e0a
 
 # 参考资料