解决冲突

zhsihan · Nov 15, 2018 · 3b6ab0c · 3b6ab0c
1 parent 5ebfdc9
commit 3b6ab0c
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/php/README.md b/php/README.md
@@ -17,11 +17,7 @@
 * findMiddleNode 求链表的中间结点
 
 #### 08_stack
-<<<<<<< HEAD
-* 链栈实现
-=======
 * 链栈实现
 
 #### 09_stack
 * 队列链表实现
->>>>>>> upstream/master
diff --git a/php/composer.json b/php/composer.json
@@ -7,12 +7,8 @@
         "psr-4": {
             "Algo_06\\": "06_linkedlist/",
             "Algo_07\\": "07_linkedlist/",
-<<<<<<< HEAD
-            "Algo_08\\": "08_stack/"
-=======
             "Algo_08\\": "08_stack/",
             "Algo_09\\": "09_queue/"
->>>>>>> upstream/master
         }
     }
 }