From 8003ad051a2b320f515b457f5d6eede06fab6115 Mon Sep 17 00:00:00 2001
From: Ark74 <ark@switnet.org>
Date: Sun, 10 May 2020 07:34:54 -0500
Subject: [PATCH] Fix merge conflict

---
 quick_jibri_installer.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/quick_jibri_installer.sh b/quick_jibri_installer.sh
index ad3ab34..3554c92 100644
--- a/quick_jibri_installer.sh
+++ b/quick_jibri_installer.sh
@@ -146,11 +146,7 @@ echo "Add Jitsi key"
 if [ "$JITSI_REPO" = "stable" ]; then
 	echo "Jitsi stable repository already installed"
 else
-<<<<<<< HEAD
-	echo 'deb https://download.jitsi.org stable/' > /etc/apt/sources.list.d/jitsi-stable.list
-=======
-	echo 'deb http://download.jitsi.org unstable/' > /etc/apt/sources.list.d/jitsi-unstable.list
->>>>>>> 2dd120e... Set additional jibri node variables
+	echo 'deb http://download.jitsi.org stable/' > /etc/apt/sources.list.d/jitsi-stable.list
 	wget -qO -  https://download.jitsi.org/jitsi-key.gpg.key | apt-key add -
 fi
 #Default to LE SSL?