From b93e46de1438e5e93b0f640f0914ee7c39d6ffe0 Mon Sep 17 00:00:00 2001
From: Adam Warner <PromoFaux@users.noreply.github.com>
Date: Sat, 30 Jan 2016 14:55:02 +0000
Subject: [PATCH] Update basic-install.sh

---
 automated install/basic-install.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index f3771764..cd1b1efa 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -287,11 +287,7 @@ installConfigs() {
 	$SUDO echo -n "::: Installing configs..."
 	$SUDO mv /etc/dnsmasq.conf /etc/dnsmasq.conf.orig
 	$SUDO mv /etc/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.conf.orig
-<<<<<<< HEAD
-	$SUDO cp /etc/.pihole/advanced/dnsmasq.conf /etc/dnsmasq.conf 
-=======
 	$SUDO cp /etc/.pihole/advanced/dnsmasq.conf /etc/dnsmasq.conf
->>>>>>> CBH/Bugfix/Formatting
 	$SUDO cp /etc/.pihole/advanced/lighttpd.conf /etc/lighttpd/lighttpd.conf
 	$SUDO sed -i "s/@INT@/$piholeInterface/" /etc/dnsmasq.conf
 	$SUDO echo " done."