Oops; fix a merge conflict that got committed into event2/event-config.h. Now msvc...

diff --git a/WIN32-Code/event2/event-config.h b/WIN32-Code/event2/event-config.h
index 97f102adbd2ff8d974fb4e2d1b419f135cd78320..dbf70bd56f6b55a643cf95c2d94897ff7c77cc11 100644 (file)
--- a/WIN32-Code/event2/event-config.h
+++ b/WIN32-Code/event2/event-config.h
@@ -334,13 +334,7 @@
 #define EVENT__TIME_WITH_SYS_TIME 1
 
 /* Version number of package */
-<<<<<<< HEAD
 #define EVENT__VERSION "2.1.0-alpha-dev"
-||||||| merged common ancestors
-#define EVENT__VERSION "2.0.16-stable-dev"
-=======
-#define EVENT__VERSION "2.0.17-stable"
->>>>>>> origin/patches-2.0
 
 /* Define to appropriate substitue if compiler doesnt have __func__ */
 #define EVENT____func__ __FUNCTION__