merge conflict resolved

Former-commit-id: 7896cdd4

CICD/heat/gc_HOT.yaml

@@ -104,11 +104,7 @@ resources:
     name:
      list_join: [ '-', [ { get_param: "OS::stack_name" }, 'sql0' ]]
     availability_zone: { get_param: avz }
-<<<<<<< HEAD
     flavor: m3.xsmall
-=======
-    flavor: m3.small
->>>>>>> a64ba97998b3abad991dce401da622d28c1802dd
     image: { get_param: centos_7_image_id }
     key_name: { get_param: ssh_key }
     security_groups: [ { get_resource: SSHMonashSecGroup }, { get_resource: SlurmSecGroup }, { get_resource: MySQLSecGroup }, { get_resource: NFSSecGroup } ]