auto commit

2018-08-06 00:17:57 +08:00 · 2018-08-06 00:17:57 +08:00 · 4bee3f40f5
commit 4bee3f40f5
parent beb7a82703
1 changed files with 0 additions and 10 deletions
--- 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

 # 参考资料