Merge branch '2.8'

nicolas-grekas · nicolas-grekas · commit 1c1c4e70054d · 2015-11-09T14:21:10.000+01:00
* 2.8:
  Fix merge
diff --git 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...
+ --------------------- ----------------------------------------------------------------- 
+  [32mParameter[39m             [32mValue[39m                                                            
+ --------------------- ----------------------------------------------------------------- 
+  twig.form.resources   ["bootstrap_3_horizontal_layout.html.twig","bootstrap_3_layo...  
+ --------------------- -----------------------------------------------------------------

-Original file line number
+Diff line change
@@ @@ -1 +1,5 @@ @@
 -["bootstrap_3_horizontal_layout.html.twig","bootstrap_3_layo...
 + --------------------- -----------------------------------------------------------------
 +  [32mParameter[39m             [32mValue[39m
 + --------------------- -----------------------------------------------------------------
 +  twig.form.resources   ["bootstrap_3_horizontal_layout.html.twig","bootstrap_3_layo...
 + --------------------- -----------------------------------------------------------------