X-Git-Url: http://git.hcoop.net/clinton/Virtual-Jaguar-Rx.git/blobdiff_plain/60b5816d36af93d7915ba553a1d09cc96d8cb2a2..47b6ecae8f96f86ae72d0a76ada94c943bad54b3:/src/file.cpp

diff --git a/src/file.cpp b/src/file.cpp
index 7e9fb34..c1cf88a 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -38,13 +38,8 @@
 #include "libelf/libelf.h"
 #include "libelf/gelf.h"
 #include "libdwarf.h"
-<<<<<<< HEAD
 #include "debugger/ELFManager.h"
 #include "debugger/DBGManager.h"
-=======
-#include "debugger\ELFManager.h"
-#include "debugger\DBGManager.h"
->>>>>>> origin/master
 
 
 // Private function prototypes
@@ -268,6 +263,9 @@ WriteLog("FILE: Cartridge run address is reported as $%X...\n", jaguarRunAddress
 											case ELF_debug_loc_TYPE:
 												break;
 
+											case ELF_heap_TYPE:
+												break;
+
 											case ELF_comment_TYPE:
 												break;