From 3b8ca1a28960f9f22c19835afaf833e44820b4c4 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Fri, 29 Dec 2017 22:30:41 +0100 Subject: [PATCH] fix merge --- .../Tests/Fixtures/application_renderexception_doublewidth1.txt | 2 +- .../application_renderexception_doublewidth1decorated.txt | 2 +- .../Tests/Fixtures/application_renderexception_doublewidth2.txt | 2 +- .../Tests/Fixtures/application_renderexception_escapeslines.txt | 2 +- .../Tests/Fixtures/application_renderexception_linebreaks.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth1.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth1.txt index 01986c917b..99f4b37057 100644 --- a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth1.txt +++ b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth1.txt @@ -1,5 +1,5 @@ -In ApplicationTest.php line 716: +In ApplicationTest.php line 726: エラーメッセージ diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth1decorated.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth1decorated.txt index ba057d8cc7..14886bd37e 100644 --- a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth1decorated.txt +++ b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth1decorated.txt @@ -1,5 +1,5 @@ -In ApplicationTest.php line 716: +In ApplicationTest.php line 726:    エラーメッセージ    diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth2.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth2.txt index 66b52c879a..01ec1b30e0 100644 --- a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth2.txt +++ b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth2.txt @@ -1,5 +1,5 @@ -In ApplicationTest.php line 730: +In ApplicationTest.php line 740: コマンドの実行中にエラーが 発生しました。 diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_escapeslines.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_escapeslines.txt index 326ee42f6d..24513d4ef5 100644 --- a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_escapeslines.txt +++ b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_escapeslines.txt @@ -1,5 +1,5 @@ -In ApplicationTest.php line 744: +In ApplicationTest.php line 754: dont break here < info>! diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_linebreaks.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_linebreaks.txt index 88ee0f29ff..7664b9e354 100644 --- a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_linebreaks.txt +++ b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_linebreaks.txt @@ -1,5 +1,5 @@ -In ApplicationTest.php line 761: +In ApplicationTest.php line 771: line 1 with extra spaces line 2