Update backupDBLifeLog.sh

diff --git a/backupDBLifeLog.sh b/backupDBLifeLog.sh
index f69c46bd49229f60ebe3adc6e654e5ac8d5d9ffc..335ae3d4f416eab102b93f349ad42c5e4dda3118 100755 (executable)
--- a/backupDBLifeLog.sh
+++ b/backupDBLifeLog.sh
@@ -7,15 +7,9 @@
 #
 # Programed by: Will Budic
 # Open Source License -> https://choosealicense.com/licenses/isc/
-<<<<<<< HEAD
-
 #Example crontab -e entry for every three hours.
 #crontab -> * */3 * * * ./backupDBLifeLog.sh > /dev/null 2>&1
 
-
-
-=======
->>>>>>> dev.1.2
 DIR="/home/will/Documents/dbLifeLog"
 NOW=`date +%Y%m%d`