Fix conflicts after merge

This commit is contained in:
Jakub Turek
2015-05-16 20:23:48 +02:00
parent 5db9905ed4
commit 8a5f0ee23e
+4 -7
View File
@@ -21,13 +21,6 @@ use Mage\Compiler;
*/ */
class CompileCommand extends AbstractCommand class CompileCommand extends AbstractCommand
{ {
public function __construct()
{
$this->setName('Compile command')
->setHelpMessage('Compiles Magallanes to mage.phar file')
->setSyntaxMessage('mage compile');
}
/** /**
* @var Compiler * @var Compiler
*/ */
@@ -40,6 +33,10 @@ class CompileCommand extends AbstractCommand
} }
$this->compiler = $compiler; $this->compiler = $compiler;
$this->setName('Compile command')
->setHelpMessage('Compiles Magallanes to mage.phar file')
->setSyntaxMessage('mage compile');
} }
/** /**