From 0c48704753e2ce6d127a151c0d53f017fa6c1f5d Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sat, 12 Oct 2013 19:25:20 -0400
Subject: fix a few remaining merge conflicts

---
 .crontab.local | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 .crontab.local

(limited to '.crontab.local')

diff --git a/.crontab.local b/.crontab.local
deleted file mode 100644
index e69de29..0000000
-- 
cgit v1.2.3-2-g168b