From 2d4ebf5eb5687bc631f04414f4e3a827d30d8daf Mon Sep 17 00:00:00 2001
From: Promofaux <adzjwarner@gmail.com>
Date: Sun, 24 Jan 2016 20:29:22 +0000
Subject: [PATCH] FIX CONFLICTS

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

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index ca5fc0b3..c8048811 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -263,7 +263,6 @@ setStaticIPv4(){
 }
 
 installScripts(){
-<<<<<<< HEAD
 	$SUDO echo ":::"
 	$SUDO echo -n "::: Installing scripts..."
 	$SUDO cp /etc/.pihole/gravity.sh /usr/local/bin/gravity.sh	
@@ -285,29 +284,6 @@ installConfigs(){
 	$SUDO cp /etc/.pihole/advanced/lighttpd.conf /etc/lighttpd/lighttpd.conf 
 	$SUDO sed -i "s/@INT@/$piholeInterface/" /etc/dnsmasq.conf
 	$SUDO echo " done."
-=======
-$SUDO echo " "
-$SUDO echo "::: Installing scripts..."
-$SUDO curl -o /usr/local/bin/gravity.sh https://raw.githubusercontent.com/pi-hole/pi-hole/master/gravity.sh
-$SUDO curl -o /usr/local/bin/chronometer.sh https://raw.githubusercontent.com/pi-hole/pi-hole/master/advanced/Scripts/chronometer.sh
-$SUDO curl -o /usr/local/bin/whitelist.sh https://raw.githubusercontent.com/pi-hole/pi-hole/master/advanced/Scripts/whitelist.sh
-$SUDO curl -o /usr/local/bin/blacklist.sh https://raw.githubusercontent.com/pi-hole/pi-hole/master/advanced/Scripts/blacklist.sh
-$SUDO curl -o /usr/local/bin/piholeLogFlush.sh https://raw.githubusercontent.com/pi-hole/pi-hole/master/advanced/Scripts/piholeLogFlush.sh
-$SUDO curl -o /usr/local/bin/updateDashboard.sh https://raw.githubusercontent.com/pi-hole/pi-hole/master/advanced/Scripts/updateDashboard.sh
-$SUDO chmod 755 /usr/local/bin/{gravity,chronometer,whitelist,blacklist,piholeLogFlush,updateDashboard}.sh
-$SUDO echo "::: ...done."
-}
-
-installConfigs(){
-$SUDO echo " "
-$SUDO echo "::: Installing configs..."
-$SUDO mv /etc/dnsmasq.conf /etc/dnsmasq.conf.orig
-$SUDO mv /etc/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.conf.orig
-$SUDO curl -o /etc/dnsmasq.conf https://raw.githubusercontent.com/pi-hole/pi-hole/master/advanced/dnsmasq.conf
-$SUDO curl -o /etc/lighttpd/lighttpd.conf https://raw.githubusercontent.com/pi-hole/pi-hole/master/advanced/lighttpd.conf
-$SUDO sed -i "s/@INT@/$piholeInterface/" /etc/dnsmasq.conf
-$SUDO echo "::: ...done."
->>>>>>> master
 }
 
 stopServices(){
@@ -318,28 +294,6 @@ stopServices(){
 	$SUDO echo " done."
 }
 
-<<<<<<< HEAD
-installDependencies(){
-$SUDO echo " "
-$SUDO echo "::: Updating apt-get package list"
-$SUDO apt-get -qq update & spinner $!
-$SUDO echo "::: Upgrading apt-get packages"
-$SUDO apt-get -yqq upgrade & spinner $!
-$SUDO echo "::: ...done."
-$SUDO echo "::: installing dnsutils, bc, toilet, unzip, and figlet..."
-$SUDO apt-get -yqq install dnsutils bc toilet unzip figlet & spinner $!
-$SUDO echo "::: ...done."
-$SUDO echo "::: Installing dnsmasq..."
-$SUDO apt-get -yqq install dnsmasq & spinner $!
-$SUDO echo "::: ...done."
-$SUDO echo "::: Installing lighttpd, php5-common, php5-cgi, and php5..."
-$SUDO apt-get -yqq install lighttpd php5-common php5-cgi php5 & spinner $!
-$SUDO echo "::: ...done."
-$SUDO echo "::: Installing git..."
-$SUDO apt-get -yqq install git & spinner $!
-$SUDO echo "::: ...done."
-=======
-
 checkForDependencies(){
  		echo ":::" 		
  		#Check to see if apt-get update has already been run today
@@ -376,8 +330,6 @@ checkForDependencies(){
           echo " already installed!"
       fi
     done
-
->>>>>>> 736edf44e4bf89e2e7f57e4c062453aa5af0fcac
 }
 
 getGitFiles(){
@@ -446,7 +398,6 @@ CreateLogFile(){
 }
 
 installPiholeWeb(){
-<<<<<<< HEAD
 	$SUDO echo ":::"
 	$SUDO echo -n "::: Installing pihole custom index page..."
 	if [ -d "/var/www/html/pihole" ]; then
@@ -465,25 +416,6 @@ installCron(){
 	$SUDO echo -n "::: Installing latest Cron script..."
 	$SUDO cp /etc/.pihole/advanced/pihole.cron /etc/cron.d/pihole
 	$SUDO echo " done!"
-=======
-$SUDO echo " "
-$SUDO echo "::: Downloading and installing pihole custom index page..."
-if [ -d "/var/www/html/pihole" ]; then	
-  $SUDO echo "::: Existing page detected, not overwriting"
-else  
-	$SUDO mkdir /var/www/html/pihole
-	$SUDO mv /var/www/html/index.lighttpd.html /var/www/html/index.lighttpd.orig
-	$SUDO curl -o /var/www/html/pihole/index.html https://raw.githubusercontent.com/pi-hole/pi-hole/master/advanced/index.html	
-fi
-$SUDO echo "::: ...done."
-}
-
-installCron(){
-$SUDO echo " "
-$SUDO echo "::: Downloading latest Cron script..."
-$SUDO curl -o /etc/cron.d/pihole https://raw.githubusercontent.com/pi-hole/pi-hole/master/advanced/pihole.cron
-$SUDO echo "::: ...done."
->>>>>>> master
 }
 
 runGravity(){