From 261d713f9836e5d1225052ddd36004be37182661 Mon Sep 17 00:00:00 2001
From: Safa Bayar <rectionxx@gmail.com>
Date: Fri, 18 Oct 2019 01:20:28 -0400
Subject: [PATCH] Correctness for 57 line

---
 openvpn-install.sh | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/openvpn-install.sh b/openvpn-install.sh
index 35ff92f..4affa51 100755
--- a/openvpn-install.sh
+++ b/openvpn-install.sh
@@ -54,11 +54,7 @@ function checkOS () {
 		source /etc/os-release
 		if [[ "$ID" = "centos" ]]; then
 			OS="centos"
-<<<<<<< HEAD
-			if [[ ! $VERSION_ID =~ (7|8) ]]; then
-=======
-			if [[ ! $VERSION_ID ~= "7|8" ]]; then
->>>>>>> e2e58b20b3e962f186ab7556b3a20ca559593724
+			if [[ ! $VERSION_ID ~= (7|8) ]]; then
 				echo "⚠️ Your version of CentOS is not supported."
 				echo ""
 				echo "The script only support CentOS 7."
@@ -1146,7 +1142,7 @@ function removeOpenVPN () {
 	read -rp "Do you really want to remove OpenVPN? [y/n]: " -e -i n REMOVE
 	if [[ "$REMOVE" = 'y' ]]; then
 		# Get OpenVPN port from the configuration
-		PORT=$(grep '^port ' /etc/openvpn/server.conf | cut -d " " -f 2)
+		PORT=$(grep '^port ' /etc/op	envpn/server.conf | cut -d " " -f 2)
 
 		# Stop OpenVPN
 		if [[ "$OS" =~ (fedora|arch|centos) ]]; then