From 8a5f0ee23ee26c960f0b5b57856d29de78632b26 Mon Sep 17 00:00:00 2001
From: Jakub Turek <jakub.turek@edpauto.com>
Date: Sat, 16 May 2015 20:23:48 +0200
Subject: [PATCH] Fix conflicts after merge

---
 Mage/Command/BuiltIn/CompileCommand.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/Mage/Command/BuiltIn/CompileCommand.php b/Mage/Command/BuiltIn/CompileCommand.php
index ae08ab9..38a8049 100644
--- 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');
     }
 
     /**