From 373bca8babf4cea76abb33edcab150cccd3f725d Mon Sep 17 00:00:00 2001
From: Arfan <soraeshan6@gmail.com>
Date: Sat, 20 Sep 2025 19:30:30 +0600
Subject: [PATCH 1/3] Add Student.java with getters/setters/constructors

---
 myaddition/Student.java | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 myaddition/Student.java

diff --git a/myaddition/Student.java b/myaddition/Student.java
new file mode 100644
index 000000000000..432c6261936a
--- /dev/null
+++ b/myaddition/Student.java
@@ -0,0 +1,12 @@
+public class Student {
+    private String name;
+    private int id;
+
+    public Student() {}
+    public Student(String name, int id) { this.name = name; this.id = id; }
+
+    public String getName() { return name; }
+    public void setName(String name) { this.name = name; }
+    public int getId() { return id; }
+    public void setId(int id) { this.id = id; }
+}
\ No newline at end of file

From 4372ddb6ef8320b57979e8a1a55ea63b729fd0d6 Mon Sep 17 00:00:00 2001
From: Arfan <soraeshan6@gmail.com>
Date: Sat, 20 Sep 2025 19:35:56 +0600
Subject: [PATCH 2/3] Added the calculator.java

---
 myaddition/Calculator.java | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 myaddition/Calculator.java

diff --git a/myaddition/Calculator.java b/myaddition/Calculator.java
new file mode 100644
index 000000000000..1a27cac06d1b
--- /dev/null
+++ b/myaddition/Calculator.java
@@ -0,0 +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; }
+}
\ No newline at end of file

From 29136537116f91e5631ef89e8376271fe9b91d88 Mon Sep 17 00:00:00 2001
From: Arfan <soraeshan6@gmail.com>
Date: Sat, 20 Sep 2025 19:43:23 +0600
Subject: [PATCH 3/3] adding from master

---
 myaddition/Calculator.java | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 myaddition/Calculator.java

diff --git a/myaddition/Calculator.java b/myaddition/Calculator.java
new file mode 100644
index 000000000000..5979be2dd63d
--- /dev/null
+++ b/myaddition/Calculator.java
@@ -0,0 +1,4 @@
+public class Calculator {
+    // Master branch version
+    public int add(int a, int b) { return a + b + 100; }  // different logic!
+}