aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorRyan Kavanagh <ryanakca@kubuntu.org>2011-08-18 08:30:19 -0400
committerRyan Kavanagh <ryanakca@kubuntu.org>2011-08-25 07:43:06 -0400
commitd9ceb9050df1004a6920d7ff36bbd96e5f52ef02 (patch)
treeea62a7c5e66de299a817280316554326b88d21af /.gitignore
parentDifferent locales on different systems, handle (diff)
Added merge target
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
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