summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorMartin Ritchie <ritchiem@apache.org>2008-08-08 12:18:51 +0000
committerMartin Ritchie <ritchiem@apache.org>2008-08-08 12:18:51 +0000
commit87e525bd50d48d2c185a84a3ae0e7643e25ee105 (patch)
treec44c5202f8303c2ae8eddf24bc5e7987c998a5b4 /.gitignore
parente69f3107612a419a499fe61c55c00ccafa309614 (diff)
downloadqpid-python-87e525bd50d48d2c185a84a3ae0e7643e25ee105.tar.gz
Reverted the addition of *.rej and *.orig so we can see them in a status list.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@683948 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '.gitignore')
-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