From: wbudic <redacted>
Date: Thu, 7 Mar 2019 01:42:48 +0000 (+1100)
Subject: Merge.
X-Git-Url: https://lifelog.hopto.org/gitweb/?a=commitdiff_plain;h=eecddcbfab20cd8530fb6b1f724d95a290abeb22;p=LifeLog.git

Merge.
---

eecddcbfab20cd8530fb6b1f724d95a290abeb22
diff --cc backupDBLifeLog.sh
index 8686b9e,7a675c8..f69c46b
--- a/backupDBLifeLog.sh
+++ b/backupDBLifeLog.sh
@@@ -7,12 -7,6 +7,15 @@@
  #
  # 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
++#crontab -> * */3 * * * ./backupDBLifeLog.sh > /dev/null 2>&1
 +
 +
 +
++=======
++>>>>>>> dev.1.2
  DIR="/home/will/Documents/dbLifeLog"
  NOW=`date +%Y%m%d`