diff options
author | Zach Inglis <zach@lt3media.com> | 2008-08-25 14:22:40 -0400 |
---|---|---|
committer | Zach Inglis <zach@lt3media.com> | 2008-08-25 14:22:40 -0400 |
commit | eaa9c064390c7c303be6e6571a14d7dd611ed07b (patch) | |
tree | 181daa891e916c3a0144c53c37f3da6b5fdf7e83 /.gitignore | |
parent | 4c86f074a7e3506886299c6290b539d1bc5f9d03 (diff) | |
download | rails-eaa9c064390c7c303be6e6571a14d7dd611ed07b.tar.gz rails-eaa9c064390c7c303be6e6571a14d7dd611ed07b.tar.bz2 rails-eaa9c064390c7c303be6e6571a14d7dd611ed07b.zip |
fixed a silly mistake of not fixing a merge
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions