Update basic-install.sh

8 years ago · b93e46de14
parent 3c49aa9d9d
commit b93e46de14
1 changed files with 0 additions and 4 deletions
--- a/install/basic-install.sh
+++ b/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."