From 5c0bc4137a37ada4e0eb518253f3eb10fdd2f0ac Mon Sep 17 00:00:00 2001
From: Mark Bolwell <mark.bollyuk@gmail.com>
Date: Tue, 26 Jul 2022 17:38:39 +0100
Subject: [PATCH] fix merge error

Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>
---
 .github/workflows/linux_benchmark_testing.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/linux_benchmark_testing.yml b/.github/workflows/linux_benchmark_testing.yml
index 9496bd2..a4a83ac 100644
--- a/.github/workflows/linux_benchmark_testing.yml
+++ b/.github/workflows/linux_benchmark_testing.yml
@@ -93,10 +93,6 @@ 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