From 87b617e4f26719aec96acfd64f04e3d7725cde30 Mon Sep 17 00:00:00 2001 From: Md Nazrul Islam Date: Tue, 16 Nov 2021 22:39:35 +0600 Subject: [PATCH 1/4] A readme file has been created --- readme.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 readme.md diff --git a/readme.md b/readme.md new file mode 100644 index 0000000..6758942 --- /dev/null +++ b/readme.md @@ -0,0 +1,2 @@ +This is the Lab Assignment for the CSE 3120. +Md. Nazrul Islam (1707086) From 4443a332198e71bf402103490669348a298a9f44 Mon Sep 17 00:00:00 2001 From: Md Nazrul Islam Date: Tue, 16 Nov 2021 22:51:41 +0600 Subject: [PATCH 2/4] Lab.java file has been added to the master --- Lab.java | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 Lab.java diff --git a/Lab.java b/Lab.java new file mode 100644 index 0000000..4875ec9 --- /dev/null +++ b/Lab.java @@ -0,0 +1,11 @@ +public class Lab { + private int number; + + public int getNumber() { + return this.number; + } + + public void setNumber(int num) { + this.number = num; + } +} \ No newline at end of file From bbd7396ac064fff25ace818bdfc23a081a71350c Mon Sep 17 00:00:00 2001 From: Md Nazrul Islam Date: Tue, 16 Nov 2021 22:59:28 +0600 Subject: [PATCH 3/4] Lab.java file has been added to the zn branch --- Lab.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Lab.java b/Lab.java index 4875ec9..15d30c6 100644 --- a/Lab.java +++ b/Lab.java @@ -1,11 +1,11 @@ public class Lab { - private int number; + private int number_conflict; public int getNumber() { - return this.number; + return this.number_conflict; } public void setNumber(int num) { - this.number = num; + this.number_conflict = num; } } \ No newline at end of file From 1f0f18b56f20b281d5fb2851912b62e90c2b1d2d Mon Sep 17 00:00:00 2001 From: Md Nazrul Islam Date: Tue, 16 Nov 2021 23:03:59 +0600 Subject: [PATCH 4/4] Lab.java file has been modified to the master --- Lab.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Lab.java b/Lab.java index 4875ec9..0e45c7f 100644 --- a/Lab.java +++ b/Lab.java @@ -1,11 +1,11 @@ public class Lab { - private int number; + private int number_modified_in_the_master; public int getNumber() { - return this.number; + return this.number_modified_in_the_master; } public void setNumber(int num) { - this.number = num; + this.number_modified_in_the_master = num; } } \ No newline at end of file