Resolve conflict

2018-05-01 19:17:28 +09:00 · 2018-05-01 19:17:28 +09:00 · 1d6d3d2b0c
parent cdb2eff6df 3c9d0bfddc
commit 1d6d3d2b0c
1 changed files with 5 additions and 1 deletions
--- a/contributors/new-contributor-playground/new-contributors.md
+++ b/contributors/new-contributor-playground/new-contributors.md
@ -1 +1,5 @@
-First commit at kubecon
+# Hello everyone!
+
+Please feel free to talk amongst yourselves or ask questions if you need help
+
+First commit at kubecon from @mitsutaka