From 7a5f19015bc6f7c7fa23d1f7fb8e65cd38659c54 Mon Sep 17 00:00:00 2001
From: Kristian Haugene <kristian@haugene.net>
Date: Fri, 13 Oct 2017 21:23:24 +0200
Subject: [PATCH] Another merge error, wtf

---
 docker-compose.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 8098af56c..1cc6ee80d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,7 +19,6 @@ services:
     - OPENVPN_PROVIDER=PIA
     - OPENVPN_USERNAME=username
     - OPENVPN_PASSWORD=password
-    - OPENVPN_OPTS="--inactive 3600 --ping 10 --ping-exit 60"
     - OPENVPN_OPTS=--inactive 3600 --ping 10 --ping-exit 60
     - LOCAL_NETWORK=192.168.0.0/24