From 8f711a933dbc0917b43d5e29b98da7157bd5727f Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Tue, 22 Dec 2009 19:48:36 -0500
Subject: fix some merge problems

---
 files/modules_dir/.ignore | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 files/modules_dir/.ignore

(limited to 'files')

diff --git a/files/modules_dir/.ignore b/files/modules_dir/.ignore
new file mode 100644
index 0000000..e69de29
-- 
cgit v1.2.3