Fix merge conflict

Author: chkp-ophirk

CHANGELOG.rst

@@ -4,38 +4,40 @@ Check_Point.gaia Release Notes
 
 .. contents:: Topics
 
-v6.0.0
+
+v7.0.0
 ======
 
 Release Summary
 ---------------
 
-This is release 6.0.0 of ``check_point.gaia``, released on 2024-12-31.
+this release 7.0.0 of ``check_point.gaia``, released on 2025-1-1.
 
 New Modules
 -----------
-cp_gaia_virtual_systems_facts – get virtual-system objects facts on Check Point machine over Web Services API.
-cp_gaia_virtual_switch – manages virtual switch on Check Point machine over Web Services API.
-cp_gaia_virtual_switch_facts – get virtual-switch objects facts on Check Point machine over Web Services API.
-cp_gaia_virtual_gateway – manages virtual-gateway objects on Check Point machine over Web Services API.
-cp_gaia_virtual_gateway_facts – get virtual-gateway objects facts on Check Point machine over Web Services API.
-cp_gaia_virtual_vsnext_state_facts – get the VSNext state on Check Point machine over Web Services API.
+
+- check_point.gaia.cp_gaia_dynamic_content – install policy on a dynamic layer Check Point machine over Web Services API.
+- check_point.gaia.cp_gaia_dynamic_content_layer_facts – get the details of the installed policy on a given dynamic layer on a Check Point machine over Web Services API.
+- check_point.gaia.cp_gaia_dynamic_content_layers_facts – get the details of all dynamic layers on a Check Point machine over Web Services API.
+- check_point.gaia.cp_gaia_simulate_packet – simulate packet rulebase execution on a Check Point machine over Web Services API.
+
 
 v6.0.0
 ======
 
 Release Summary
 ---------------
 
-this release 6.0.0 of ``check_point.gaia``, released on 2023-11-1.
+This is release 6.0.0 of ``check_point.gaia``, released on 2024-12-31.
 
 New Modules
 -----------
-
-- check_point.gaia.cp_gaia_dynamic_content – install policy on a dynamic layer Check Point machine over Web Services API.
-- check_point.gaia.cp_gaia_dynamic_content_layer_facts – get the details of the installed policy on a given dynamic layer on a Check Point machine over Web Services API.
-- check_point.gaia.cp_gaia_dynamic_content_layers_facts – get the details of all dynamic layers on a Check Point machine over Web Services API.
-- check_point.gaia.cp_gaia_simulate_packet – simulate packet rulebase execution on a Check Point machine over Web Services API.
+cp_gaia_virtual_systems_facts – get virtual-system objects facts on Check Point machine over Web Services API.
+cp_gaia_virtual_switch – manages virtual switch on Check Point machine over Web Services API.
+cp_gaia_virtual_switch_facts – get virtual-switch objects facts on Check Point machine over Web Services API.
+cp_gaia_virtual_gateway – manages virtual-gateway objects on Check Point machine over Web Services API.
+cp_gaia_virtual_gateway_facts – get virtual-gateway objects facts on Check Point machine over Web Services API.
+cp_gaia_virtual_vsnext_state_facts – get the VSNext state on Check Point machine over Web Services API.
 
 
 v5.0.1

plugins/modules/cp_gaia_dynamic_content.py

@@ -54,7 +54,7 @@
         default: False
         type: bool
 short_description: installing policy
-version_added: '6.0.0'
+version_added: '7.0.0'
 notes:
 - its advisable to perform with wait_for_task set to false and refer to show_task command
 """

plugins/modules/cp_gaia_dynamic_content_layer_facts.py

@@ -41,7 +41,7 @@
         default: True
         type: bool
 short_description: getting information of the chosen dynamic layer.
-version_added: '6.0.0'
+version_added: '7.0.0'
 
 """
 

plugins/modules/cp_gaia_dynamic_content_layers_facts.py

@@ -37,7 +37,7 @@
         default: True
         type: bool
 short_description: get the names and meta-data of all dynamic layers.
-version_added: '6.0.0'
+version_added: '7.0.0'
 
 """
 

plugins/modules/cp_gaia_simulate_packet.py

@@ -115,7 +115,7 @@
         default: True
         required: False
 short_description: installing policy
-version_added: '6.0.0'
+version_added: '7.0.0'
 notes:
 - its advisable to perform with wait_for_task set to false and refer to show_task command
 """