From 2e53dfb0f66b9c78a0ef84eb03f24883bdbe3ff7 Mon Sep 17 00:00:00 2001
From: JohnyDev <john.bedeir@gmail.com>
Date: Sun, 10 Dec 2023 11:09:25 +0100
Subject: [PATCH] Fix-conflict

---
 Argo-CD/Argocd-EKS/deploy-argocd-eks.sh | 2 +-
 Argo-CD/Argocd-EKS/remove-argocd-eks.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Argo-CD/Argocd-EKS/deploy-argocd-eks.sh b/Argo-CD/Argocd-EKS/deploy-argocd-eks.sh
index d0ecb0f..0067c86 100755
--- a/Argo-CD/Argocd-EKS/deploy-argocd-eks.sh
+++ b/Argo-CD/Argocd-EKS/deploy-argocd-eks.sh
@@ -39,4 +39,4 @@ kubectl get service ${RELEASE_NAME}-argocd-server -n ${NAMESPACE} | awk '{print
 #Reveal ArgoCD Pass
 echo "--------------------ArgoCD UI Password--------------------"
 echo "Username: admin"
-kubectl -n ${NAMESPACE} get secret argocd-initial-admin-secret -o jsonpath="{.data.password}" | base64 -d > argo-pass.txt
+kubectl -n ${NAMESPACE} get secret argocd-initial-admin-secret -o jsonpath="{.data.password}" | base64 -d > argo-pass.txt
\ No newline at end of file
diff --git a/Argo-CD/Argocd-EKS/remove-argocd-eks.sh b/Argo-CD/Argocd-EKS/remove-argocd-eks.sh
index bab3daf..197f60d 100755
--- a/Argo-CD/Argocd-EKS/remove-argocd-eks.sh
+++ b/Argo-CD/Argocd-EKS/remove-argocd-eks.sh
@@ -18,4 +18,4 @@ rm -rf argo-pass.txt
 
 #Sleep 30 seconds
 echo "--------------------Wait for completely delete EKS--------------------"
-sleep 30s
+sleep 30s
\ No newline at end of file