Resolve conflict

This commit is contained in:
Mitz Amano 2018-05-01 19:17:28 +09:00
commit 1d6d3d2b0c
1 changed files with 5 additions and 1 deletions

View File

@ -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