résolution conflit

[gestion-adh.git] / nos_oignons.gemspec

diff --git a/nos_oignons.gemspec b/nos_oignons.gemspec
index 921bf88baf59896f292f2294f003f0af5fb2b6ee..f8cc0184e393f21f20bc719db58d1c2db5dae615 100644 (file)
--- a/nos_oignons.gemspec
+++ b/nos_oignons.gemspec
@@ -26,9 +26,11 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'cucumber'
   s.add_development_dependency 'aruba'
-  s.add_development_dependency 'json', '~> 1.7.7'
+  s.add_development_dependency 'json'
   s.add_development_dependency 'timecop'
+  s.add_development_dependency 'webmock'
   s.add_runtime_dependency 'safe_yaml'
   s.add_runtime_dependency 'mail'
   s.add_runtime_dependency 'prawn'
+  s.add_runtime_dependency 'rest-client'
 end