Skip to content

Commit 3a71c48

Browse files
committed
Conflicting Calculator.java added in master branch
1 parent 44b5865 commit 3a71c48

1 file changed

Lines changed: 10 additions & 0 deletions

File tree

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
public class Calculator {
2+
// ADDITION - CONFLICT
3+
public double add(double a, double b) { return a + b + 1; }
4+
// SUBTRACTION
5+
public double sub(double a, double b) { return a - b; }
6+
// MULTIPLICATION
7+
public double mul(double a, double b) { return a * b; }
8+
// DIVISION - CONFLICT
9+
public double div(double a, double b) { return a / b; }
10+
}

0 commit comments

Comments
 (0)