From d1cfee5cb8c7642ed621b77b8e1472da10fa71a0 Mon Sep 17 00:00:00 2001
From: Usman Nasir <usman@cyberpersons.com>
Date: Tue, 8 Sep 2020 22:13:35 +0500
Subject: [PATCH] reenable rsync

---
 cyberpanel.sh | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/cyberpanel.sh b/cyberpanel.sh
index ef33f9bdc..569993eea 100644
--- a/cyberpanel.sh
+++ b/cyberpanel.sh
@@ -390,10 +390,6 @@ if [[ -d /etc/yum.repos.d ]] ; then
 	if [[ $CENTOS_8 == "True" ]] ; then
   		dnf install zip -y
 	elif [[ $CENTOS_8 == "False" ]] ; then
-<<<<<<< HEAD
-  		curl https://raw.githubusercontent.com/usmannasir/cyberpanel/v2.0.1/install/CyberPanel.repo > /etc/yum.repos.d/CyberPanel.repo
-=======
-
 	    ###### Setup Required Repos
 
   		## Start with PDNS
@@ -426,9 +422,6 @@ EOF
   ## IUS Repo
 
   yum install https://repo.ius.io/ius-release-el7.rpm -y
-
-
->>>>>>> 29c0a38e... do not depend on CyberPanel own repo fro cent7
 	fi
 fi