Finalize changelog and release for version v6.21.0

Author: vsin12

CHANGELOG.md

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 ## 6.22.0 (January 16, 2025)
 
 ### Added
@@ -18,6 +19,9 @@
 
 
 ## 6.21.0 (December 19, 2024)
+=======
+## 6.21.0 (Unreleased)
+>>>>>>> 57b36061333 (Finalize changelog and release for version v6.21.0)
 
 ### Added
 - Support for ADB-S: Backup Retention Lock

internal/globalvar/version.go

@@ -7,9 +7,15 @@ import (
 	"log"
 )
 
+<<<<<<< HEAD
 const Version = "6.22.0"
 
 const ReleaseDate = "2025-01-19"
+=======
+const Version = "6.21.0"
+
+const ReleaseDate = "2024-12-22"
+>>>>>>> 57b36061333 (Finalize changelog and release for version v6.21.0)
 
 func PrintVersion() {
 	log.Printf("[INFO] terraform-provider-oci %s\n", Version)