Merge branch 'master' into 'master'

FINALLY FIX INDENTS

See merge request ms180498/rpn_collab!3

src/calc.cpp

@@ -8,7 +8,7 @@ int plus(    int a, int b) { return a + b; }
 int minus(   int a, int b) { return a - b; }
 int multiply(int a, int b) { return a * b; }
 int divide(  int a, int b) { return a / b; }
-int power(     int a, int b) { return std::pow(a, b); }
+int power(   int a, int b) { return std::pow(a, b); }
 int modulo(  int a, int b) { return a % b; }
 
 int pop_stack(auto &stack) {
@@ -32,7 +32,7 @@ int evaluate(const std::string &s) {
     case '-': change_stack_state(minus,    stack); break;
     case '*': change_stack_state(multiply, stack); break;
     case '/': change_stack_state(divide,   stack); break;
-    case '^': change_stack_state(power,      stack); break;
+    case '^': change_stack_state(power,    stack); break;
     case '%': change_stack_state(modulo,   stack); break;
     case '0'...'9': stack.push(c - '0'); break;
     default: