summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 8c94886e7..f5a3e0212 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@ config.php
dataobject.ini
*~
*.bak
+*.orig
+*.rej