Fix merge conflict in gemspec

tenderlove · Nov 17, 2010 · 60a7f10 · 60a7f10
2 parents a1cfa26 + 959ac92
commit 60a7f10
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/mail.gemspec b/mail.gemspec
@@ -16,7 +16,8 @@ Gem::Specification.new do |s|
   s.add_dependency('activesupport', ">= 2.3.6")
   s.add_dependency('mime-types', "~> 1.16")
   s.add_dependency('treetop', '~> 1.4.8')
-  s.add_dependency('i18n', '>= 0.4.1')
+  s.add_dependency('i18n', '~> 0.4.1')
+  s.add_dependency('tlsmail', '~> 0.0.1') if RUBY_VERSION == '1.8.6'
 
   s.require_path = 'lib'
   s.files = %w(README.rdoc Rakefile TODO.rdoc) + Dir.glob("lib/**/*")