Commit d7cf8e37 authored by Dave Loper's avatar Dave Loper

fix conflict

parent f72064c7
Pipeline #61322973 canceled with stages
in 6 minutes and 58 seconds
...@@ -5,11 +5,7 @@ ...@@ -5,11 +5,7 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
$app['basename'] = 'openvpn'; $app['basename'] = 'openvpn';
<<<<<<< HEAD
$app['version'] = '2.4.5'; $app['version'] = '2.4.5';
=======
$app['version'] = '2.4.3';
>>>>>>> 331a1cdcfffd66c7d1ac4e39a3d082db0a38e92a
$app['vendor'] = 'ClearFoundation'; $app['vendor'] = 'ClearFoundation';
$app['packager'] = 'ClearFoundation'; $app['packager'] = 'ClearFoundation';
$app['license'] = 'GPLv3'; $app['license'] = 'GPLv3';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment