Fix conflicts after merge

10 years ago · 8a5f0ee23e
parent 5db9905ed4
commit 8a5f0ee23e
1 changed files with 4 additions and 7 deletions
--- a/Mage/Command/BuiltIn/CompileCommand.php
+++ b/Mage/Command/BuiltIn/CompileCommand.php
@ -21,13 +21,6 @@ use Mage\Compiler;
 */
 class CompileCommand extends AbstractCommand
 {
-    public function __construct()
-    {
-        $this->setName('Compile command')
-            ->setHelpMessage('Compiles Magallanes to mage.phar file')
-            ->setSyntaxMessage('mage compile');
-    }
-
    /**
     * @var Compiler
     */
@ -40,6 +33,10 @@ class CompileCommand extends AbstractCommand
        }

        $this->compiler = $compiler;
+
+        $this->setName('Compile command')
+            ->setHelpMessage('Compiles Magallanes to mage.phar file')
+            ->setSyntaxMessage('mage compile');
    }

    /**