Cleaning up after rebase

diff --git a/version.m4 b/version.m4
index f9c399b77c0134b61dd13f21260fe0daa6273d45..5723d3c50eb91623e7a959bed92e9a2389b30ea3 100644 (file)
--- 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])