Skip to content

Testing #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LokeshBachu wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Testing #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
255fe98
resolving conflicts
LokeshBachu May 18, 2018
16a81f7
diff file
LokeshBachu May 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
<<<<<<< HEAD
# BasicJavaExamplesupdated readme
=======
testinh
>>>>>>> new feature in this branch
7 changes: 7 additions & 0 deletions diff.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions file.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@

hello