more merge fixes

This commit is contained in:
Nikita Smith
2025-06-25 10:53:25 -07:00
committed by Ryan Fleury
parent 91ddd214b3
commit 7769a485ba
3 changed files with 27 additions and 28 deletions
-4
View File
@@ -17,9 +17,7 @@
#include "base/base_inc.h"
#include "os/os_inc.h"
#include "path/path.h"
#include "coff/coff.h"
#include "coff/coff_enum.h"
#include "coff/coff_parse.h"
#include "coff/coff_obj_writer.h"
#include "coff/coff_lib_writer.h"
@@ -29,9 +27,7 @@
#include "base/base_inc.c"
#include "os/os_inc.c"
#include "path/path.c"
#include "coff/coff.c"
#include "coff/coff_enum.c"
#include "coff/coff_parse.c"
#include "coff/coff_obj_writer.c"
#include "coff/coff_lib_writer.c"