From cde68b37206ae4b87da1f1892f8884fa52593f20 Mon Sep 17 00:00:00 2001
From: Kate Vang <kate.vang@one.org>
Date: Tue, 27 Jun 2017 10:43:38 +0100
Subject: [PATCH] Update chron

---
 data_update_cron | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/data_update_cron b/data_update_cron
index de1dd61..57e971e 100644
--- a/data_update_cron
+++ b/data_update_cron
@@ -1,6 +1 @@
-<<<<<<< HEAD
-16 2 * * * sudo python ~/humanitarian-data-service/update.py
-=======
-# Run data download script once a week (every Monday 2:30am) to pull the latest data
-10 13 * * * sudo python ~/humanitarian-data-service/update.py
->>>>>>> 7135defe7922984894c7ca6469eb8782119bc8a8
+16 2 * * * sudo python ~/humanitarian-data-service/update.py
\ No newline at end of file