diff options
author | jerico.dev <jerico.dev@gmail.com> | 2011-06-23 01:40:20 -0300 |
---|---|---|
committer | Riccardo (C10uD) <c10ud.dev@gmail.com> | 2011-09-01 12:04:24 +0200 |
commit | 5e7b247ac9b6ff1eeaad619af43b49d6bf8639db (patch) | |
tree | 295a0ba6c5781274d0758660124cfe8cae3a27eb | |
parent | df4be68e15e28d502d03a9ac2d13dae093d3a372 (diff) |
do not ignore merge leftovers
-rw-r--r-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -1,4 +1,3 @@ -*.orig *.pyc *.swp /doc/user-api/ |