summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
1 files changed, 0 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 2a58a829e2..8aa991f21e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,8 +57,6 @@ qpid/java/release
.settings
generated/
target/
-*.rej
-*.orig
# Intellij Project files
*.iml
*.ipr