Fix merge conflicts

This commit is contained in:
Tuan Dang
2023-07-21 20:49:41 +07:00
217 changed files with 11802 additions and 20564 deletions

View File

@@ -91,8 +91,8 @@
"documentation/getting-started/introduction",
"documentation/getting-started/platform",
"documentation/getting-started/sdks",
"documentation/getting-started/docker",
"documentation/getting-started/kubernetes",
"integrations/platforms/kubernetes",
"integrations/platforms/docker-intro",
"documentation/getting-started/api"
]
},
@@ -187,7 +187,9 @@
{
"group": "Docker",
"pages": [
"integrations/platforms/docker-intro",
"integrations/platforms/docker",
"integrations/platforms/docker-pass-envs",
"integrations/platforms/docker-compose"
]
},