Browse Source

Remove uneeded trait.

ADmad 8 years ago
parent
commit
848d1973b1
1 changed files with 0 additions and 2 deletions
  1. 0 2
      src/Controller/Controller.php

+ 0 - 2
src/Controller/Controller.php

@@ -26,7 +26,6 @@ use Cake\Log\LogTrait;
 use Cake\ORM\Locator\LocatorAwareTrait;
 use Cake\Routing\RequestActionTrait;
 use Cake\Routing\Router;
-use Cake\Utility\MergeVariablesTrait;
 use Cake\View\ViewVarsTrait;
 use LogicException;
 use ReflectionClass;
@@ -88,7 +87,6 @@ class Controller implements EventListenerInterface, EventDispatcherInterface
     use EventDispatcherTrait;
     use LocatorAwareTrait;
     use LogTrait;
-    use MergeVariablesTrait;
     use ModelAwareTrait;
     use RequestActionTrait;
     use ViewVarsTrait;