From c3e36bb367d96edda34d9861c244283ff27b31c5 Mon Sep 17 00:00:00 2001 From: Luiz Aoqui Date: Fri, 8 Apr 2022 12:36:47 -0400 Subject: [PATCH] docs: fix upgrade specific broken link and conflict tag (#12521) --- website/content/docs/upgrade/upgrade-specific.mdx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/website/content/docs/upgrade/upgrade-specific.mdx b/website/content/docs/upgrade/upgrade-specific.mdx index 1364a6a19..d8d32d86a 100644 --- a/website/content/docs/upgrade/upgrade-specific.mdx +++ b/website/content/docs/upgrade/upgrade-specific.mdx @@ -94,7 +94,6 @@ be removed in future releases. The previous `Protocol` value can be viewed using the `-verbose` flag. -<<<<<<< HEAD #### Linux Control Groups Version 2 Starting with Nomad 1.3.0, Linux systems configured to use [cgroups v2][cgroups2] @@ -1331,7 +1330,7 @@ deleted and then Nomad 0.3.0 can be launched. [preemption]: /docs/internals/scheduling/preemption [proxy_concurrency]: /docs/job-specification/sidecar_task#proxy_concurrency [`sidecar_task.config`]: /docs/job-specification/sidecar_task#config -[raft protocol version]: /docs/configuration/server#raft_protocol +[`raft_protocol_version`]: /docs/configuration/server#raft_protocol [`raft protocol`]: /docs/configuration/server#raft_protocol [reserved]: /docs/configuration/client#reserved-parameters [task-config]: /docs/job-specification/task#config