fixed wrong merge

2015-01-16 15:57:18 +01:00 · 2015-01-16 15:57:18 +01:00 · 1a2636dd20
commit 1a2636dd20
parent d5df960022
1 changed files with 0 additions and 1 deletions
--- a/src/Symfony/Bridge/Monolog/Logger.php
+++ b/src/Symfony/Bridge/Monolog/Logger.php
@ -65,7 +65,6 @@ class Logger extends BaseLogger implements LoggerInterface, DebugLoggerInterface

    /**
     * {@inheritdoc}
->>>>>>> 2.7
     */
    public function getLogs()
    {