From: wbudic <redacted>
Date: Thu, 7 Mar 2019 02:02:45 +0000 (+1100)
Subject: Update backupDBLifeLog.sh
X-Git-Url: https://lifelog.hopto.org/gitweb/?a=commitdiff_plain;h=a63b6b06aca73704216bd11b9a8d3d82744f215b;p=LifeLog.git

Update backupDBLifeLog.sh
---

diff --git a/backupDBLifeLog.sh b/backupDBLifeLog.sh
index f69c46b..335ae3d 100755
--- 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`