fix merge

Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>

.github/workflows/github_vars.tfvars

@@ -10,4 +10,4 @@ ami_key_pair_name = "github_actions"
 private_key       = ".ssh/github_actions.pem"
 main_vpc_cidr     = "172.22.0.0/24"
 public_subnets    = "172.22.0.128/26"
-private_subnets   = "172.22.0.192/26"
+private_subnets   = "172.22.0.192/26"

.github/workflows/linux_benchmark_testing.yml

@@ -93,7 +93,10 @@ jobs:
         id: test_os
         run: >-
           ansible all -i hosts.yml -m wait_for -a "port=22 delay=10 timeout=600" --private-key=.ssh/github_actions.pem -u ec2-user -vvv
+<<<<<<< HEAD
 
+=======
+>>>>>>> df2d812e6a15a5330198cd77a57fbc2019ea040e
 
 # Run the ansible playbook
       - name: Run_Ansible_Playbook

.github/workflows/variables.tf

@@ -67,4 +67,4 @@ variable "public_subnets" {
 variable "private_subnets" {
   description = "private subnet cidr block"
   type        = string
-}
+}