From db23e142931f8deb5674c1402aabe2cc52681686 Mon Sep 17 00:00:00 2001
From: Darin McBride <dmcbride@cpan.org>
Date: Fri, 7 Nov 2014 16:38:41 -0700
Subject: [PATCH] Backfit chiselchat changes from pt back to develop.

---
 .gitignore | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitignore b/.gitignore
index 5009eea5..87661dbc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,9 @@ etc/log4perl.conf
 etc/mime.types
 etc/nginx.conf
 var/www/public/index.html
+<<<<<<< HEAD
+=======
+
+bin/schedule_building.pid
+bin/schedule_ship_arrival.pid
+>>>>>>> Backfit chiselchat changes from pt back to develop.
-- 
2.51.2