From 33a8bedd416cfdc3be5f69ef6a84e0aa4cb9d1da Mon Sep 17 00:00:00 2001 From: santoshg9698 Date: Tue, 24 Nov 2020 15:38:05 +0530 Subject: [PATCH 1/3] One file changed --- src/org/edureka/shipping/IShipment.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/org/edureka/shipping/IShipment.java b/src/org/edureka/shipping/IShipment.java index f251550..1b5bf9e 100644 --- a/src/org/edureka/shipping/IShipment.java +++ b/src/org/edureka/shipping/IShipment.java @@ -8,4 +8,6 @@ public interface IShipment { public boolean getShipment(); + // methods are present + } From ecfb31ee0e15783c1b3183b691f20e9c85c7f542 Mon Sep 17 00:00:00 2001 From: santoshg9698 Date: Wed, 25 Nov 2020 11:10:40 +0530 Subject: [PATCH 2/3] adding a new text files --- src/org/edureka/shipping/mine.txt | 1 + src/org/edureka/shipping/myFile.txt | 1 + 2 files changed, 2 insertions(+) create mode 100644 src/org/edureka/shipping/mine.txt create mode 100644 src/org/edureka/shipping/myFile.txt diff --git a/src/org/edureka/shipping/mine.txt b/src/org/edureka/shipping/mine.txt new file mode 100644 index 0000000..2c727cf --- /dev/null +++ b/src/org/edureka/shipping/mine.txt @@ -0,0 +1 @@ +gdjhcieuwiueo \ No newline at end of file diff --git a/src/org/edureka/shipping/myFile.txt b/src/org/edureka/shipping/myFile.txt new file mode 100644 index 0000000..db37e2d --- /dev/null +++ b/src/org/edureka/shipping/myFile.txt @@ -0,0 +1 @@ +Hello I am Santosh \ No newline at end of file From 78bfba10e9d0ea32e41ec079e546ba90b6d4a6ae Mon Sep 17 00:00:00 2001 From: santoshg9698 Date: Sat, 28 Nov 2020 15:52:31 +0530 Subject: [PATCH 3/3] commiting 2 files to merge --- src/org/edureka/shipping/IShipment.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/org/edureka/shipping/IShipment.java b/src/org/edureka/shipping/IShipment.java index 1b5bf9e..84ef8f8 100644 --- a/src/org/edureka/shipping/IShipment.java +++ b/src/org/edureka/shipping/IShipment.java @@ -10,4 +10,6 @@ public interface IShipment { // methods are present + // I am changing files + }