From 8b3f02b5b5ddab7cc83dea91c55676c5d60cc66d Mon Sep 17 00:00:00 2001
From: Alex Lovell-Troy <alovelltroy@lanl.gov>
Date: Fri, 7 Mar 2025 17:10:31 -0500
Subject: [PATCH] feat(secrets): implement SecretStore interface and
 StaticStore/LocalStore for credential management

---
 go.mod | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/go.mod b/go.mod
index 3bfe1c5..e0f0aa5 100644
--- a/go.mod
+++ b/go.mod
@@ -52,13 +52,9 @@ require (
 	github.com/subosito/gotenv v1.6.0 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.9.0 // indirect
-<<<<<<< HEAD
 	golang.org/x/crypto v0.31.0 // indirect
 	golang.org/x/sys v0.28.0 // indirect
-=======
-	golang.org/x/crypto v0.32.0 // indirect
 	golang.org/x/sys v0.29.0 // indirect
->>>>>>> 3b85dd3 (chore: fix critical dependabot issues by updating crypto)
 	golang.org/x/text v0.21.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect