aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2012-01-30 14:35:48 -0400
committerJoey Hess <joey@kitenet.net>2012-01-30 14:35:48 -0400
commit6bea6fced9b8db4748ac44141668b9d9fc831980 (patch)
tree973c1bf56aa9ad5c153dc5f29d49630ed8d9526a /.gitignore
parentb33f69ab514f83d3fed1fd873f251d62f65d62a1 (diff)
downloadikiwiki-6bea6fced9b8db4748ac44141668b9d9fc831980.tar
ikiwiki-6bea6fced9b8db4748ac44141668b9d9fc831980.tar.gz
Revert "ignore a file that always clutters status on OS X (no known fix)"
This reverts commit 662d256c821d85d041a7620aa0bac6144ff95af4. I sympathize, but this would prevent commits to that file everywhere else.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index da2f4eb46..fe1c3d441 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,4 +19,3 @@ po/underlays/directives/ikiwiki/directive/*.mdwn
po/underlays_copy_stamp
underlays/locale
/t/tmp/
-doc/bugs/Pages_with_non-ascii_characters_like_*