Skip to content

Instantly share code, notes, and snippets.

Embed
What would you like to do?
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
You can’t perform that action at this time.