résolution conflit

[gestion-adh.git] / nos_oignons.gemspec

diff --git a/nos_oignons.gemspec b/nos_oignons.gemspec
index c174de22a76b18f260cbbf577a793f76b33b212c..f8cc0184e393f21f20bc719db58d1c2db5dae615 100644 (file)
--- a/nos_oignons.gemspec
+++ b/nos_oignons.gemspec
@@ -28,7 +28,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'aruba'
   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