diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.3' into 2.7

Browse Source 
* 2.3:
  [Console] Fix whitespaces in fixture

Conflicts:
	src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt
	src/Symfony/Component/Console/Tests/Fixtures/application_asxml2.txt
This commit is contained in:
Nicolas Grekas 2015-09-19 22:42:33 +02:00
commit f64cf23811
2 changed files with 137 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt
View File

@ -58,7 +58,7 @@
<description>Do not ask any interactive question</description>
</option>
</options>
</command>
</command>
<command id="list" name="list">
<usages>
<usage>list [--xml] [--raw] [--format FORMAT] [--] [&lt;namespace&gt;]</usage>
@ -99,7 +99,7 @@
</defaults>
</option>
</options>
</command>
</command>
<command id="foo:bar" name="foo:bar">
<usages>
<usage>foo:bar</usage>
@ -131,7 +131,7 @@
<description>Do not ask any interactive question</description>
</option>
</options>
</command>
</command>
</commands>
<namespaces>
<namespace id="_global">

2
src/Symfony/Component/Console/Tests/Fixtures/application_asxml2.txt
View File

@ -32,6 +32,6 @@
<description>Do not ask any interactive question</description>
</option>
</options>
</command>
</command>
</commands>
</symfony>