résolution conflit

[gestion-adh.git] / features / support / fixtures.rb

diff --git a/features/support/fixtures.rb b/features/support/fixtures.rb
index 3c74f4b7e9f409e87aed063aac083c89d5128e5a..723f3516f06366d42a6a552801638521c9b72aba 100644 (file)
--- a/features/support/fixtures.rb
+++ b/features/support/fixtures.rb
@@ -86,7 +86,7 @@ def member_filename_for_id(id)
 end
 
 def render_member_file(locals)
-  ERB.new(MEMBER_FILE_TEMPLATE, nil, '-').result(OpenStruct.new(locals).instance_eval { binding })
+  ERB.new(MEMBER_FILE_TEMPLATE, trim_mode: '-').result(OpenStruct.new(locals).instance_eval { binding })
 end
 
 def new_id