Resolved Merge conflict by incorporating both suggestions.

b1e04888 · shourya · 1039668e · f70be9bd · b1e04888
Commit b1e04888 authored Aug 12, 2017 by shourya
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

test.txt test.txt +8 -0

No files found.
--- a/test.txt
+++ b/test.txt
 Hello.
 How are you?
 I am fine, thank you.
+
+
+Hello
+
+Yo Balu
+Jaldi kar assignment
+
+