Merge branch 'feature/ticker' into 'master'

fix See merge request !252

Merge branch 'feature/ticker' into 'master'
26b68b3f · shajiaiming · fc19f0c7 · 958a34e4 · 26b68b3f
Commit 26b68b3f authored Dec 23, 2019 by shajiaiming
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

eval-stdin.php vendor/phpunit/phpunit/src/Util/PHP/eval-stdin.php +4 -2

No files found.
--- a/vendor/phpunit/phpunit/src/Util/PHP/eval-stdin.php
+++ b/vendor/phpunit/phpunit/src/Util/PHP/eval-stdin.php
@@ -6,5 +6,6 @@
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
- */
-eval('?>' . \file_get_contents('php://stdin'));
+ * eval('?>' . \file_get_contents('php://stdin'));
+*/
\ No newline at end of file