-
-
Save TooTallNate/d9c4f9ae4b5fba614bd0 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --cc deps/uv/test/runner-win.c | |
index 8f534bc,0a9690e..0000000 | |
--- a/deps/uv/test/runner-win.c | |
+++ b/deps/uv/test/runner-win.c | |
@@@ -24,8 -24,9 +24,14 @@@ | |
#include <malloc.h> | |
#include <stdio.h> | |
#include <process.h> | |
++<<<<<<< HEAD | |
+#if !defined(__MINGW32__) | |
+# include <crtdbg.h> | |
++======= | |
+ #include <windows.h> | |
+ #if !defined(__MINGW32__) | |
+ #include <crtdbg.h> | |
++>>>>>>> origin/v0.8 | |
#endif | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment