Rules: Port relevant changelog entries to the new version

nikitacano · nikitacano · commit 53a017f1dc31 · 2025-02-11T19:23:53.000Z
diff --git a/src/content/changelogs-next/2024-11-22-cloud-connector-r2.mdx b/src/content/changelogs-next/2024-11-22-cloud-connector-r2.mdx
@@ -1,5 +1,5 @@
 ---
-title: "Cloud Connector Now Supports R2"
+title: Cloud Connector Now Supports R2
 description: Cloud Connector now integrates with Cloudflare R2 for object storage.
 products:
   - rules
diff --git a/src/content/changelogs-next/2024-12-11-terraform-snippets.mdx b/src/content/changelogs-next/2024-12-11-terraform-snippets.mdx
@@ -33,8 +33,4 @@ resource "cloudflare_snippet_rules" "cookie_snippet_rule" {
 }
 ```
 
-<<<<<<< HEAD
-For more details, refer to [Configure Snippets using Terraform](/rules/snippets/create-terraform/).
-=======
-Learn more in the [Configure Snippets using Terraform](/rules/snippets/create-terraform/) documentation.
->>>>>>> b995929da (Rules: Port relevant changelog entries to the new version)
+Learn more in the [Configure Snippets using Terraform](/rules/snippets/create-terraform/) documentation.

Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,4 @@ resource "cloudflare_snippet_rules" "cookie_snippet_rule" {`
`33`	`33`	`}`
`34`	`34`	```
`35`	`35`
`36`		`-<<<<<<< HEAD`
`37`		`-For more details, refer to [Configure Snippets using Terraform](/rules/snippets/create-terraform/).`
`38`		`-=======`
`39`		`-Learn more in the [Configure Snippets using Terraform](/rules/snippets/create-terraform/) documentation.`
`40`		`->>>>>>> b995929da (Rules: Port relevant changelog entries to the new version)`
	`36`	`+Learn more in the [Configure Snippets using Terraform](/rules/snippets/create-terraform/) documentation.`