Skip to content
Snippets Groups Projects
Commit 6323da0d authored by Sigurd Almåsbakk Skogmo's avatar Sigurd Almåsbakk Skogmo
Browse files

Merge branch 'revert-0969e5ee' into 'master'

Revert ";"

See merge request !2
parents 0969e5ee 7103df43
No related branches found
No related tags found
1 merge request!2Revert ";"
Pipeline #71954 passed
......@@ -41,7 +41,7 @@ public class CalculatorResource {
else if(expressionTrimmed.matches("^\\d+(?:\\s*[-]\\s*\\d+)*$")) result = subtraction(expressionTrimmed);
else if(expressionTrimmed.matches("^\\d+(?:\\s*[*]\\s*\\d+)*$")) result = multiplication(expressionTrimmed);
else if(expressionTrimmed.matches("^\\d+(?:\\s*[/]\\s*\\d+)*$")) result = division(expressionTrimmed);
else return "Ugyldig inndata";
else return "Ugyldig inndata"
return String.valueOf(result);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment