fix conflicts

steinkel · steinkel · commit 7d3ec4160c1f · 2019-03-14T14:24:57.000Z
diff --git a/src/Plugin.php b/src/Plugin.php
@@ -2,8 +2,6 @@
 namespace CakeDC\Api;
 
 use Cake\Core\BasePlugin;
-use Cake\Core\PluginApplicationInterface;
-
 /**
  * Api plugin
  */
