conflict after #11

vramdhanie · Mar 9, 2017 · 35d84ed · 35d84ed
2 parents acd64d4 + 12ce3a0
commit 35d84ed
Showing 1 changed file with 22 additions and 1 deletion.
diff --git a/KnockKnock/content.md b/KnockKnock/content.md
@@ -99,7 +99,28 @@ Bouddha who?
 
 Bouddha that bread for me please.
 
-#10
+# 10
+
+Knock! Knockw!
+
+Who's there?
+
+Joke.
+
+Joke who?
+
+Joke number 10 that should cause conflicts!
+
+#11
+
+Knock! Knock!
+Who's there? 
+Git.
+Git who?
+Git your own joke!
+
+#12
+
 Knock Knock!
 who's there?
 the milkman