summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2009-11-28 00:27:08 -0500
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2009-11-28 00:27:08 -0500
commit6afaa6d392e97cc425e4ecdc82f3c1a3716986f4 (patch)
tree9820db259abb2bfdee7b46804a1bb3fd6495092b /.gitignore
parent818d0b99a9ed70a2f92c59a835a2a51bc66dc7d1 (diff)
downloadaskbot-6afaa6d392e97cc425e4ecdc82f3c1a3716986f4.tar.gz
askbot-6afaa6d392e97cc425e4ecdc82f3c1a3716986f4.tar.bz2
askbot-6afaa6d392e97cc425e4ecdc82f3c1a3716986f4.zip
fixed some local merge errors
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions