From b431b7c3a5f3d765c776d7d35dd6ac84ead9bc4c Mon Sep 17 00:00:00 2001
From: David Sommerseth <dazo@users.sourceforge.net>
Date: Tue, 27 Apr 2010 23:06:44 +0200
Subject: [PATCH] Cleaning up after rebase

---
 version.m4 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/version.m4 b/version.m4
index f9c399b77..5723d3c50 100644
--- a/version.m4
+++ b/version.m4
@@ -1,6 +1,5 @@
 dnl define the OpenVPN version
 define(PRODUCT_VERSION,[2.1.1g])
->>>>>>> Set socket buffers (SO_SNDBUF and SO_RCVBUF) immediately after
 dnl define the TAP version
 define(PRODUCT_TAP_ID,[tap0901])
 define(PRODUCT_TAP_WIN32_MIN_MAJOR,[9])
-- 
2.47.2