Resolve conflict
This commit is contained in:
commit
1d6d3d2b0c
|
|
@ -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
|
||||||
Loading…
Reference in New Issue