git shit

josh-works · Feb 17, 2017 · 71333df · 71333df
1 parent efdebc8
commit 71333df
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/readme.md b/readme.md
@@ -20,7 +20,7 @@ Here's how we'll spend some time:
 - adding and committing
 - modify this document.
 - delete our master branch, because why not?
-- make a pull request. (oh, and re-add our master branch)
+- make a pull request. (oh, and re-add our master branch) (this might inspire the aformentioned merge conflict)
 - checking out earlier commit.