diff options
| author | rick <technoweenie@gmail.com> | 2008-05-31 17:15:24 -0700 |
|---|---|---|
| committer | rick <technoweenie@gmail.com> | 2008-05-31 17:15:24 -0700 |
| commit | 6a975d6ca28216cfa015374c802279349e9253ca (patch) | |
| tree | e0a73c68e00755993f2bac86115f178656637c93 /actionmailer/lib | |
| parent | 72483c0d4c1e4ea794919974100acc2f255f6fd2 (diff) | |
| parent | ea03b0885c110003496c1f99dc7d9d2f1534955b (diff) | |
| download | rails-6a975d6ca28216cfa015374c802279349e9253ca.tar.gz rails-6a975d6ca28216cfa015374c802279349e9253ca.tar.bz2 rails-6a975d6ca28216cfa015374c802279349e9253ca.zip | |
fix changelog conflict
Diffstat (limited to 'actionmailer/lib')
| -rw-r--r-- | actionmailer/lib/action_mailer/version.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/version.rb b/actionmailer/lib/action_mailer/version.rb index 88b9a3c200..c35b648baf 100644 --- a/actionmailer/lib/action_mailer/version.rb +++ b/actionmailer/lib/action_mailer/version.rb @@ -1,8 +1,8 @@ module ActionMailer module VERSION #:nodoc: MAJOR = 2 - MINOR = 0 - TINY = 991 + MINOR = 1 + TINY = 0 STRING = [MAJOR, MINOR, TINY].join('.') end |