From 0bb46c1ae2b9ce95bbdf0d317e9adcffb660d52d Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Mon, 9 Nov 2015 14:20:59 +0100 Subject: [PATCH] Fix merge --- .../Tests/Fixtures/Descriptor/array_parameter.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/array_parameter.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/array_parameter.txt index 182037f246..6ba6c9c6ea 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/array_parameter.txt +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/array_parameter.txt @@ -1 +1,5 @@ -["bootstrap_3_horizontal_layout.html.twig","bootstrap_3_layo... + --------------------- ----------------------------------------------------------------- + Parameter Value + --------------------- ----------------------------------------------------------------- + twig.form.resources ["bootstrap_3_horizontal_layout.html.twig","bootstrap_3_layo... + --------------------- -----------------------------------------------------------------