diff options
Diffstat (limited to 'lib/win32/getopt_long.cpp')
| -rwxr-xr-x | lib/win32/getopt_long.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/win32/getopt_long.cpp b/lib/win32/getopt_long.cpp index a508d22a..31695aa0 100755 --- a/lib/win32/getopt_long.cpp +++ b/lib/win32/getopt_long.cpp @@ -58,10 +58,7 @@ */
// #include "Box.h"
-<<<<<<< HEAD -======= #include "emu.h"
->>>>>>> 0.12 #include <errno.h>
#include <stdarg.h>
|