From 65e56f25c63208fba582de3332b8e956fd0766e5 Mon Sep 17 00:00:00 2001
From: badra001 <donald.e.badrak.ii@census.gov>
Date: Wed, 22 Nov 2023 20:20:33 -0500
Subject: [PATCH] fix

---
 CHANGELOG.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d73889..9f9733a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -71,10 +71,4 @@
 
 * 2.8.3 -- 2022-09-14
   - fix access key variables and usage
-<<<<<<< HEAD
   - add secret
-=======
-
-* 2.8.4 -- 2023-11-22
-  - if pgp_key_file is not provided (empty), it will use the secret vs encrypted secret, so that the secret can be used as input into other resources
->>>>>>> 045eb41f1a92a7a1d4485246e132fe15d4e2e95d