Skip to content

Commit 9834913

Browse files
committed
Conflict resolved in Calculator.java
2 parents 3a71c48 + fceeb7a commit 9834913

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/main/java/com/thealgorithms/Calculator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
public class Calculator {
2-
// ADDITION - CONFLICT
3-
public double add(double a, double b) { return a + b + 1; }
2+
// ADDITION
3+
public double add(double a, double b) { return a + b; }
44
// SUBTRACTION
55
public double sub(double a, double b) { return a - b; }
66
// MULTIPLICATION

0 commit comments

Comments
 (0)