Fix merge

This commit is contained in:
Nicolas Grekas 2015-11-09 14:20:59 +01:00
parent d86a3f3172
commit 0bb46c1ae2

View File

@ -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...
--------------------- -----------------------------------------------------------------