From 07cb57042d11a386b9616a6c55af5bd0596f68ea Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 3 Apr 2012 16:08:23 -0400
Subject: [PATCH] Oops; fix a merge conflict that got committed into
 event2/event-config.h.  Now msvc builds work again.

---
 WIN32-Code/event2/event-config.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/WIN32-Code/event2/event-config.h b/WIN32-Code/event2/event-config.h
index 97f102ad..dbf70bd5 100644
--- 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__
-- 
2.40.0