summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorailin-nemui <ailin-nemui@users.noreply.github.com>2017-11-26 00:31:01 +0100
committerGitHub <noreply@github.com>2017-11-26 00:31:01 +0100
commit466d074200e4893f57c4c716c746e8549af65339 (patch)
treedce2b3013e63b295c14af90d62f9acbd908c2ac7 /.gitignore
parent8dfeca57ede1e726de07522a87203ce13676882d (diff)
parent3792bc9ba95b8b9fd12ad60b86b8bbb06e913dc1 (diff)
downloadirssi-466d074200e4893f57c4c716c746e8549af65339.zip
Merge branch 'master' into hide-lines
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 9af0c4b1..efc579cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,6 @@ config.status
configure
default-config.h
default-theme.h
-faq.txt
irssi-config
irssi-config.h
irssi-config.h.in