aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorWaylan Limberg <waylan@gmail.com>2012-01-18 21:29:19 -0500
committerWaylan Limberg <waylan@gmail.com>2012-01-18 21:29:19 -0500
commitc33dbafc2663e2d495c53ab0bf26f5f6c4087863 (patch)
treea00f8f59e2774438cf66125b362016a19ad1393e /.gitignore
parent77c587e1d16934608fc91aa34894836ef0d03a8b (diff)
parent69b365d07c7fabb206d9094398de2162cbcf6ba3 (diff)
downloadmarkdown-c33dbafc2663e2d495c53ab0bf26f5f6c4087863.tar.gz
markdown-c33dbafc2663e2d495c53ab0bf26f5f6c4087863.tar.bz2
markdown-c33dbafc2663e2d495c53ab0bf26f5f6c4087863.zip
Merge branch 'master' of git://github.com/fiesta/Python-Markdown into fiesta
Conflicts: markdown/inlinepatterns.py
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index ebf5e84..c57cc74 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.DS*
*.pyc
*.bak
*.swp
@@ -8,4 +9,4 @@ tmp/*
MANIFEST
.venv
*~
-#*
+*#*