diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-06-29 01:54:16 +0000 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-06-29 01:54:16 +0000 |
commit | 1fd9a46d713a4b314621bd7cf171bd048b10741f (patch) | |
tree | 86f5aa702b43bacee7a3f982b191dac5f4ec7d3c /cleanlogs.sh | |
parent | 5b866f75a7ba5970a51a91cf643d03cc89f5c4c3 (diff) | |
download | rails-1fd9a46d713a4b314621bd7cf171bd048b10741f.tar.gz rails-1fd9a46d713a4b314621bd7cf171bd048b10741f.tar.bz2 rails-1fd9a46d713a4b314621bd7cf171bd048b10741f.zip |
Resolve conflict among mailer actions with the same name. Closes #5520.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4509 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'cleanlogs.sh')
0 files changed, 0 insertions, 0 deletions