diff options
| author | Mitz Amano <mitsutaka.amano@gmail.com> | 2018-05-01 19:17:28 +0900 |
|---|---|---|
| committer | Mitz Amano <mitsutaka.amano@gmail.com> | 2018-05-01 12:20:03 +0200 |
| commit | 1d6d3d2b0cab1b8d51bc24841f8e4e438d2a5c1d (patch) | |
| tree | 4738be90c3e16ad333c004cf14d9495ecfbbae19 | |
| parent | cdb2eff6df56d77a40006f996853ff27aa2160e5 (diff) | |
| parent | 3c9d0bfddc5b955e8b536daea4acae6fc075038d (diff) | |
Resolve conflict
| -rw-r--r-- | contributors/new-contributor-playground/new-contributors.md | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/contributors/new-contributor-playground/new-contributors.md b/contributors/new-contributor-playground/new-contributors.md index cc86b6f0..6604eb65 100644 --- a/contributors/new-contributor-playground/new-contributors.md +++ b/contributors/new-contributor-playground/new-contributors.md @@ -1 +1,5 @@ -First commit at kubecon
\ No newline at end of file +# Hello everyone! + +Please feel free to talk amongst yourselves or ask questions if you need help + +First commit at kubecon from @mitsutaka
\ No newline at end of file |