summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Sommerseth <dazo@users.sourceforge.net>2010-04-27 23:06:44 +0200
committerDavid Sommerseth <dazo@users.sourceforge.net>2010-04-27 23:06:44 +0200
commit52975238c753fa43fb17b394d43568d6a8175601 (patch)
tree9cd7f8901e73b4527384e7ac7c3f14413159e925
parent21367f367dcbb0bd820f828de627be619de2b113 (diff)
downloadopenvpn-52975238c753fa43fb17b394d43568d6a8175601.tar.gz
openvpn-52975238c753fa43fb17b394d43568d6a8175601.tar.xz
openvpn-52975238c753fa43fb17b394d43568d6a8175601.zip
Cleaning up after rebase
-rw-r--r--version.m41
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])