summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjerico.dev <jerico.dev@gmail.com>2011-06-23 01:40:20 -0300
committerRiccardo (C10uD) <c10ud.dev@gmail.com>2011-09-01 12:04:24 +0200
commit5e7b247ac9b6ff1eeaad619af43b49d6bf8639db (patch)
tree295a0ba6c5781274d0758660124cfe8cae3a27eb
parentdf4be68e15e28d502d03a9ac2d13dae093d3a372 (diff)
do not ignore merge leftovers
-rw-r--r--.gitignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 6524146..3f395af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-*.orig
*.pyc
*.swp
/doc/user-api/