From f1757ad76de65f50c499880416507412664c784e Mon Sep 17 00:00:00 2001 From: trujillo-adam Date: Wed, 15 Feb 2023 14:26:46 -0800 Subject: [PATCH] resolving conflicts --- .../docs/connect/config-entries/service-splitter.mdx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/website/content/docs/connect/config-entries/service-splitter.mdx b/website/content/docs/connect/config-entries/service-splitter.mdx index 27c103c714b5..34ea9597e218 100644 --- a/website/content/docs/connect/config-entries/service-splitter.mdx +++ b/website/content/docs/connect/config-entries/service-splitter.mdx @@ -252,12 +252,8 @@ Specifies the [namespace](/consul/docs/enterprise/namespaces) to apply the confi - Data type: String ### `Partition` -<<<<<<< HEAD -Specifies the [admin partition](/consul/docs/enterprise/admin-partitions) to apply the configuration entry. -======= -Specifies the [admin partition](consul/docs/enterprise/admin-partitions) to apply the configuration entry. ->>>>>>> 826930be1ea3cf26e65d2f8b3c9a803748c6a857 +Specifies the [admin partition](/consul/docs/enterprise/admin-partitions) to apply the configuration entry. #### Values