Update file.cpp

[clinton/Virtual-Jaguar-Rx.git] / src / file.cpp

diff --git a/src/file.cpp b/src/file.cpp
index 7e9fb34..001b132 100644 (file)
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -38,13 +38,8 @@
 #include "libelf/libelf.h"\r
 #include "libelf/gelf.h"\r
 #include "libdwarf.h"\r
-<<<<<<< HEAD\r
 #include "debugger/ELFManager.h"\r
 #include "debugger/DBGManager.h"\r
-=======\r
-#include "debugger\ELFManager.h"\r
-#include "debugger\DBGManager.h"\r
->>>>>>> origin/master\r
 \r
 \r
 // Private function prototypes\r