resolved conflict

Author: Arfanjaman

myaddition/Calculator.java

@@ -1,6 +1,6 @@
 public class Calculator {
-    public int add(int a, int b){ return a + b; }
-    public int subtract(int a, int b){ return a - b; }
-    public int multiply(int a, int b){ return a * b; }
-    public double divide(int a, int b){ return (double)a / b; }
+    public int add(int a, int b) { return a + b; }
+    public int subtract(int a, int b) { return a - b; }
+    public int multiply(int a, int b) { return a * b; }
+    public double divide(int a, int b) { return (double)a / b; }
 }