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

Added 2 text files #729

Open

lesterlimjj wants to merge 13 commits into se-edu:master from lesterlimjj:master

fork test.txt

-Original file line number
+Diff line change
@@ -0,0 +1,10 @@
+    much wow
+    double wow
+    <<<<<<< HEAD
+    triple baby
+    hey message
+    is this thing on?
+    =======
+    triple baby
+    >>>>>>> parent of e73f13d (hey)

text2.txt

-Original file line number
+Diff line change
@@ -0,0 +1,6 @@
+    wow again
+    love
+    death