1 files changed, 0 insertions, 1 deletions
diff --git a/version.m4 b/version.m4
index f9c399b..5723d3c 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])