Permalink
Browse files

fix conflict in readme

  • Loading branch information...
2 parents 99819e3 + 5f0dee4 commit 5f9a1bb58f4068cc486577d26764230568175a36 @mortenjust committed Jun 7, 2016
Showing with 2 additions and 1 deletion.
  1. +2 −1 README.md
View
@@ -21,7 +21,8 @@ Follow <a href="http://twitter.com/mortenjust">@mortenjust</a> on Twitter for up
## More
* <a href="https://medium.com/@mortenjust/i-doomed-mankind-with-a-free-text-editor-ba6003319681">Medium: I doomed mankind with a free text editor</a>
* <a href="https://github.com/first20hours/google-10000-english">Google top 10,000 words</a>
-* <a href="https://xkcd.com/thing-explainer/">Randall Munroe: Thing Explainer</a>
+* <a href="https://xkcd.com/thing-explainer/">Randall Monroe: Thing Explainer</a>
+* <a href="https://xkcd.com/simplewriter/">Simple Writer</a>
* <a href="http://www.newyorker.com/tech/elements/the-space-doctors-big-idea-einstein-general-relativity">The Space Doctor's Big Idea</a>
* <a href="https://www.youtube.com/watch?v=Ac7G7xOG2Ag">Turbo Encabulator</a>

0 comments on commit 5f9a1bb

Please sign in to comment.