From: Jean-Paul Mari <1195657+djipi@users.noreply.github.com>
Date: Thu, 7 Sep 2017 05:07:14 +0000 (-0400)
Subject: Update file.cpp
X-Git-Tag: v2.1.3-R3~24
X-Git-Url: http://git.hcoop.net/clinton/Virtual-Jaguar-Rx.git/commitdiff_plain/8e5cce70e0cbada82289a9579d0c734c1f06ff93

Update file.cpp
---

diff --git a/src/file.cpp b/src/file.cpp
index 7e9fb34..001b132 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