resolving conflicts

hashicorp · Feb 15, 2023 · f1757ad · f1757ad
1 parent 9590aa2
commit f1757ad
Showing 1 changed file with 1 addition and 5 deletions.
diff --git 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` <EnterpriseAlert inline />
-<<<<<<< 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