From 2188bd834c546b40d4b19258f8729ecae86be853 Mon Sep 17 00:00:00 2001
From: June McEnroe <june@causal.agency>
Date: Thu, 31 Aug 2017 01:00:02 -0400
Subject: Add quick data file merge tool

Hopefully I won't have to use it ever again.
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index d08a301..c072f2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 chroot.tar
 client
 help
+merge
 meta
 root
 server
-- 
cgit 1.4.1