fix(interlink): meta

RoRoJ · RoRoJ · commit a80efc23bc87 · 2025-08-12T11:40:37.000+02:00
diff --git a/pages/interlink/faq.mdx b/pages/interlink/faq.mdx
@@ -1,15 +1,8 @@
 ---
-<<<<<<< HEAD
-title: InterLink FAQ
-description: Discover Scaleway InterLink and find answers to your most common questions.
-dates:
-  validation: 2025-03-18
-=======
 title: InterLink
 description: Discover Scaleway InterLink and find answers to your most common questions.
 dates:
   validation: 2025-07-09
->>>>>>> d1722557a (fix(interlink): meta)
 productIcon: InterlinkProductIcon
 ---
 
diff --git a/pages/interlink/how-to/complete-provisioning.mdx b/pages/interlink/how-to/complete-provisioning.mdx
@@ -1,9 +1,5 @@
 ---
-<<<<<<< HEAD
-title: How to complete InterLink provisioning
-=======
 title: How to complete hosted InterLink provisioning
->>>>>>> d1722557a (fix(interlink): meta)
 description: Learn how to complete the provisioning process for your Scaleway InterLink, to ensure your hosted connection between your on-premises infrastructure and Scaleway VPC is up and running as soon as possible.
 dates:
   validation: 2025-07-09
diff --git a/pages/interlink/how-to/order-interlink.mdx b/pages/interlink/how-to/order-interlink.mdx
@@ -1,9 +1,5 @@
 ---
-<<<<<<< HEAD
 title: How to order an InterLink
-=======
-title: How to create an InterLink
->>>>>>> d1722557a (fix(interlink): meta)
 description: Learn how to create an InterLink to connect your external infrastructure to your Scaleway cloud, either hosted by a partner or self-hosted with your own physical connection. Step-by-step guide included.
 dates:
   validation: 2025-07-09
diff --git a/pages/interlink/reference-content/configuring.mdx b/pages/interlink/reference-content/configuring.mdx
@@ -1,10 +1,6 @@
 ---
 title: Configuring an InterLink
-<<<<<<< HEAD
 description: Find out how to set up your Scaleway InterLink so that traffic can flow between your external infrastructure and your Scaleway resources. Understand how to attach a VPC, create a routing policy to whitelist route announcements, and activate route propagation across the connection.
-=======
- description: Find out how to set up your Scaleway InterLink so that traffic can flow between your external infrastructure and your Scaleway resources. Understand how to attach a VPC, create a routing policy to whitelist route announcements, and activate route propagation across the connection.
->>>>>>> d1722557a (fix(interlink): meta)
 tags: interlink configuration attach-vpc whitelist route-range ip-prefix route-propagation
 dates:
   validation: 2025-07-10
