From b7e6c4ec282ed4ebff1351aa7e9ad03181fca57a Mon Sep 17 00:00:00 2001
From: jacobsalmela <jacob.salmela@gmail.com>
Date: Sun, 8 Feb 2015 17:03:34 -0600
Subject: [PATCH] comment

---
 gravity-adv.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gravity-adv.sh b/gravity-adv.sh
index 8a1c901..5b1f76d 100755
--- a/gravity-adv.sh
+++ b/gravity-adv.sh
@@ -29,7 +29,7 @@ echo "Getting someone who cares ad list..."
 curl -s http://someonewhocares.org/hosts/hosts | grep -v "#" | sed '/^$/d' | sed 's/\ /\\ /g' | awk '{print $2}' >> /tmp/matter.txt
 
 # Sort the aggregated results and remove any duplicates
-<<<<<<< Updated upstream
+#<<<<<<< Updated upstream
 echo "removing duplicates and formatting to address=/<ad domain>/"$piholeIP
 cat /tmp/matter.txt | sort | uniq | sed '/^$/d' | awk -v "IP=$piholeIP" '{sub(/\r$/,""); print "address=/"$0"/"IP}' > /tmp/andLight.txt
 mv /tmp/andLight.txt $eventHorizion