Commit 4f279b6c authored by qhoangxuan's avatar qhoangxuan

fix merge conflict in PR60

parent 12caa55d
......@@ -15,5 +15,5 @@ Developer documentation
master-api
scheduler
backend
kube-backend
stats
kube-backend
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment