From 255fe9860a4e039f374e827838af0a4269e968a7 Mon Sep 17 00:00:00 2001 From: LokeshBachu Date: Sat, 19 May 2018 00:16:30 +0530 Subject: [PATCH 1/2] resolving conflicts --- README.md | 4 ++++ file.txt | 2 ++ 2 files changed, 6 insertions(+) create mode 100644 file.txt diff --git a/README.md b/README.md index 4e28b37..f4a3637 100644 --- a/README.md +++ b/README.md @@ -1 +1,5 @@ +<<<<<<< HEAD # BasicJavaExamplesupdated readme +======= +testinh +>>>>>>> new feature in this branch diff --git a/file.txt b/file.txt new file mode 100644 index 0000000..3e23ae4 --- /dev/null +++ b/file.txt @@ -0,0 +1,2 @@ + +hello From 16a81f7ce4152d9a9cf1d6ada9f5339f2a6e6852 Mon Sep 17 00:00:00 2001 From: LokeshBachu Date: Sat, 19 May 2018 00:13:15 +0530 Subject: [PATCH 2/2] diff file --- diff.txt | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 diff.txt diff --git a/diff.txt b/diff.txt new file mode 100644 index 0000000..a79b8ec --- /dev/null +++ b/diff.txt @@ -0,0 +1,7 @@ +diff --git a/README.md b/README.md +index 4e28b37..743307b 100644 +--- a/README.md ++++ b/README.md +@@ -1 +1,2 @@ + # BasicJavaExamplesupdated readme ++check difference