From d030daa55a6f00172b28bcfed5d3164288135330 Mon Sep 17 00:00:00 2001
From: NIKHILSINGH1510 <56766208+NIKHILSINGH1510@users.noreply.github.com>
Date: Tue, 6 Oct 2020 00:54:30 +0530
Subject: [PATCH 1/2] Update java1.java

---
 java1.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/java1.java b/java1.java
index 9dbba14..c30dd6b 100644
--- a/java1.java
+++ b/java1.java
@@ -2,5 +2,12 @@
 public class java1 {
     public static void main(String args[]) {
         System.out.println("This will be printed");
+<<<<<<< Updated upstream
+=======
+        System.out.println("This will also be printed");
+        System.out.println("Then why not this");
+
+
+>>>>>>> Stashed changes
     }
 }
\ No newline at end of file

From c5632325bd7c178b3330732959c6fafdc96b98c6 Mon Sep 17 00:00:00 2001
From: NIKHILSINGH1510 <56766208+NIKHILSINGH1510@users.noreply.github.com>
Date: Tue, 6 Oct 2020 01:02:29 +0530
Subject: [PATCH 2/2] Update java1.java

---
 java1.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/java1.java b/java1.java
index c30dd6b..e67ba50 100644
--- a/java1.java
+++ b/java1.java
@@ -1,13 +1,12 @@
 
 public class java1 {
-    public static void main(String args[]) {
+    public static void main(String args[])
+     {
         System.out.println("This will be printed");
-<<<<<<< Updated upstream
-=======
         System.out.println("This will also be printed");
         System.out.println("Then why not this");
 
 
->>>>>>> Stashed changes
+
     }
 }
\ No newline at end of file