Merge pull request #1 from UofTCoders/master

test merge example
GregoryU · Aug 23, 2018 · 0b88c94 · 0b88c94
2 parents a6e0751 + b0e38e7
commit 0b88c94
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/afile.txt b/afile.txt
@@ -0,0 +1 @@
+New info.
diff --git a/bio.txt b/bio.txt
@@ -0,0 +1 @@
+My name is Loic