From 50b0d61c65c33b8b01b7c6dd8b0c7dfaf6bf27af Mon Sep 17 00:00:00 2001
From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com>
Date: Fri, 10 Sep 2021 17:54:58 -0400
Subject: [PATCH] fix merge conflict for nasa/cFE#1915

---
 cfe | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cfe b/cfe
index 54c15f4c6..74d5c2862 160000
--- a/cfe
+++ b/cfe
@@ -1 +1 @@
-Subproject commit 54c15f4c61e365b7a1dee78180084074c0712029
+Subproject commit 74d5c286259e984fa20123ebaefedeae01873d25