Merge pull request wangzheng0822#154 from caiknife/master

解决冲突

Author: wangzheng0822

php/08_stack/Compute.php

@@ -28,8 +28,6 @@ function expression($str)
  array_push($operStack, $arr[$i]);
  break;
  case '*':
-<<<<<<< HEAD
-=======
  $arrLen = count($operStack);
  while ($operStack[$arrLen-1] === '/'){
  compute($numStack, $operStack);
@@ -38,7 +36,6 @@ function expression($str)
  array_push($operStack, $arr[$i]);
  break;
 
->>>>>>> upstream/master
  case '/':
  case '(':
  array_push($operStack, $arr[$i]);
@@ -81,13 +78,9 @@ function compute(&$numStack, &$operStack){
  case '-':
  array_push($numStack, array_pop($numStack) - $num);
  break;
-<<<<<<< HEAD
- 
-=======
  case '(':
  throw new \Exception("不匹配的(", 2);
  break;
->>>>>>> upstream/master
  }
 }
 expression('-1+2-(1+2*3)');

php/README.md

@@ -17,11 +17,7 @@
 * findMiddleNode 求链表的中间结点
 
 #### 08_stack
-<<<<<<< HEAD
-* 链栈实现
-=======
 * 链栈实现
 
 #### 09_stack
 * 队列链表实现
->>>>>>> upstream/master