Update

problems/0150.逆波兰表达式求值.md

@@ -89,7 +89,12 @@ C++代码如下：
 class Solution {
 public:
     int evalRPN(vector<string>& tokens) {
+<<<<<<< HEAD
         stack<long long> st;
+=======
+        // 力扣修改了后台测试数据，需要用longlong
+        stack<long long> st; 
+>>>>>>> 28f3b52a82e3cc650290fb02030a53900e122f43
         for (int i = 0; i < tokens.size(); i++) {
             if (tokens[i] == "+" || tokens[i] == "-" || tokens[i] == "*" || tokens[i] == "/") {
                 long long num1 = st.top();
@@ -104,11 +109,13 @@ public:
                 st.push(stoll(tokens[i]));
             }
         }
+
         int result = st.top();
         st.pop(); // 把栈里最后一个元素弹出（其实不弹出也没事）
         return result;
     }
 };
+
 ```
 
 ## 题外话