résolution conflit

[gestion-adh.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 42375775cdb6e62e91cfbec4a6e2704f658898c6..72db4c4b02835d58d55dc479014b3d3fa0be2936 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -19,3 +19,5 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem "matrix", "~> 0.4.2"