Merge pull request #144 from dzbaker:fix-139

Fix #139, updating ELF2CFETBL to use new versioning system.
nasa · Jan 18, 2024 · 13d4d2b · 13d4d2b
2 parents 7f2f8f0 + 998c26f
commit 13d4d2b
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/elf2cfetbl.c b/elf2cfetbl.c
@@ -35,6 +35,10 @@
 #include "ELF_Structures.h"
 #include "cfe_tbl_filedef.h"
 #include "cfe_version.h"
+<<<<<<< HEAD
+=======
+#include "cfe_config.h"
+>>>>>>> origin/pull/144/head
 #include "elf2cfetbl_version.h"
 
 #define MAX_SECTION_HDR_NAME_LEN (128)