From ad4268dd307a4a151ab2aee47a51123fb21ead9c Mon Sep 17 00:00:00 2001
From: Aditya <60684641+0x0elliot@users.noreply.github.com>
Date: Wed, 20 Nov 2024 17:44:38 +0530
Subject: [PATCH] feat: click to deploy to AWS test (resolve merge conflicts)

---
 README.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/README.md b/README.md
index 632c85c1..1ffc0c29 100755
--- a/README.md
+++ b/README.md
@@ -4,13 +4,10 @@
 
 Shuffle Automation
 
-<<<<<<< HEAD
 [![CodeQL](https://github.com/Shuffle/Shuffle/actions/workflows/codeql-analysis.yml/badge.svg?branch=launch)](https://github.com/Shuffle/Shuffle/actions/workflows/codeql-analysis.yml)
 [![Autobuild](https://github.com/Shuffle/Shuffle/actions/workflows/dockerbuild.yaml/badge.svg?branch=launch)](https://github.com/Shuffle/Shuffle/actions/workflows/dockerbuild.yaml)
 [![Deploy to Google Cloud](https://deploy.cloud.run/button.svg)](https://deploy.cloud.run/?git_repo=https://github.com/0x0elliot/Shuffle&ref=2.0.0)
 
-=======
->>>>>>> 8883de54d10855428866f598b70e16674df6d7c1
 </h1><h4 align="center">
 
 [Shuffle](https://shuffler.io) is an automation platform for and by the community, focusing on accessibility for anyone to automate. Security operations is complex, but it doesn't have to be.