diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2009-11-28 00:26:44 -0500 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2009-11-28 00:26:44 -0500 |
| commit | e80449b0765b5a5f0a8245e85fc87a613368510d (patch) | |
| tree | 9820db259abb2bfdee7b46804a1bb3fd6495092b /.gitignore | |
| parent | 30afd77f73b54346ae2b34487513773c3a86b935 (diff) | |
| download | askbot-e80449b0765b5a5f0a8245e85fc87a613368510d.tar.gz askbot-e80449b0765b5a5f0a8245e85fc87a613368510d.tar.bz2 askbot-e80449b0765b5a5f0a8245e85fc87a613368510d.zip | |
fixed some local merge errors
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions