From d9ceb9050df1004a6920d7ff36bbd96e5f52ef02 Mon Sep 17 00:00:00 2001
From: Ryan Kavanagh <ryanakca@kubuntu.org>
Date: Thu, 18 Aug 2011 08:30:19 -0400
Subject: Added merge target

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 798757d..a60e307 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@
 .*.swp
 build
 SUBSTS.local
+SUBSTS.merged
 .mutt/alias.rc
-- 
cgit v1.2.3