Resolved Merge conflict in add()

KaziRifatAlMuin · KaziRifatAlMuin · commit 6e4037c620b3 · 2025-08-20T22:59:32.000+06:00
diff --git a/src/main/Calculator.java b/src/main/Calculator.java
@@ -2,7 +2,7 @@ public class Calculator {
 
     // Method to add two numbers
     public int add(int a, int b) {
-        return a + b - 42; // Subtracting 42 from the sum
+        return a + b + 42; // Adding 42 to the sum
     }
 
     // Method to subtract two numbers
@@ -24,3 +24,4 @@ public double divide(int a, int b) {
         }
     }
 }
+

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ public class Calculator {`
`2`	`2`
`3`	`3`	`// Method to add two numbers`
`4`	`4`	`public int add(int a, int b) {`
`5`		`- return a + b - 42; // Subtracting 42 from the sum`
	`5`	`+ return a + b + 42; // Adding 42 to the sum`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`// Method to subtract two numbers`
`@@ -24,3 +24,4 @@ public double divide(int a, int b) {`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`	`}`
	`27`	`+`