Permalink
Browse files

git shit

  • Loading branch information...
1 parent efdebc8 commit 71333df25638d8cc59e3d95ea775d4d0a017aa24 @josh-works committed Feb 17, 2017
Showing with 1 addition and 1 deletion.
  1. +1 −1 readme.md
View
@@ -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.

0 comments on commit 71333df

Please sign in to comment.