Teach me to do out-of-order merges.

cchandler · Aug 12, 2012 · 4ca4407 · 4ca4407
1 parent 3673a64
commit 4ca4407
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/certificate_authority.gemspec b/certificate_authority.gemspec
@@ -69,18 +69,18 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activemodel>, ["~> 3.0.6"])
+      s.add_runtime_dependency(%q<activemodel>, [">= 3.0.6"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
-      s.add_dependency(%q<activemodel>, ["~> 3.0.6"])
+      s.add_dependency(%q<activemodel>, [">= 3.0.6"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<activemodel>, ["~> 3.0.6"])
+    s.add_dependency(%q<activemodel>, [">= 3.0.6"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rcov>, [">= 0"])