Skip to content

Commit

Permalink
Merge pull request #144 from dzbaker:fix-139
Browse files Browse the repository at this point in the history
Fix #139, updating ELF2CFETBL to use new versioning system.
  • Loading branch information
dzbaker committed Jan 18, 2024
2 parents 7f2f8f0 + 998c26f commit 13d4d2b
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions elf2cfetbl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 13d4d2b

Please sign in to comment.