Fixed merge conflict.

bash/portal/graphs.sh

@@ -193,8 +193,8 @@ sudo cp -r $BUILDDIR/portal/graphs/html/* ${DOCUMENTROOT}/graphs/
 ## EDIT CRONTAB
 
 echo -e "\033[33mAdding jobs to crontab..."
-if [ -f /tmp/foo.txt ]; then
-    echo -e "Removing previously install cron file..."
+if [ -f /etc/cron.d/adsb-feeder-performance-graphs ]; then
+    echo -e "Removing previously installed cron file..."
     sudo rm -f /etc/cron.d/adsb-feeder-performance-graphs
 fi
 echo -e "\033[37m"