summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2012-11-20 14:18:19 +0000
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2012-11-23 17:08:37 +0000
commitbae001371d7af80a1c1a432cb4f7111fcd9d6348 (patch)
treeee7801371492c3ac964ca6e1d76d9889b6413d4d
parent0e813970edc8e2c92ace7076db24a1ce8a0386f2 (diff)
downloadpykolab-bae001371d7af80a1c1a432cb4f7111fcd9d6348.tar.gz
Ignore *.orig and *.rej
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index a697154..3789b55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,10 @@ Makefile.in
*~
*.kate-swp
*.log
+*.orig
*.pyc
*.pyo
+*.rej
*.spec
*.tar.gz
aclocal.m4