projects
/
core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Renamed Registry -> GenericRegistry to make it clear that this registry does
[core.git]
/
framework
/
main
/
classes
/
resolver
/
controller
/
class_BaseControllerResolver.php
diff --git
a/framework/main/classes/resolver/controller/class_BaseControllerResolver.php
b/framework/main/classes/resolver/controller/class_BaseControllerResolver.php
index a38b4ef3a9a58f1c55da188ca0a0cd604ba78ceb..ff10fc88143361f430ed58cd770b1b13093cd70a 100644
(file)
--- a/
framework/main/classes/resolver/controller/class_BaseControllerResolver.php
+++ b/
framework/main/classes/resolver/controller/class_BaseControllerResolver.php
@@
-6,7
+6,7
@@
namespace Org\Mxchange\CoreFramework\Resolver\Controller;
use Org\Mxchange\CoreFramework\Controller\DefaultControllerException;
use Org\Mxchange\CoreFramework\Controller\Controller;
use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
use Org\Mxchange\CoreFramework\Controller\DefaultControllerException;
use Org\Mxchange\CoreFramework\Controller\Controller;
use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\
Generic
Registry;
use Org\Mxchange\CoreFramework\Resolver\BaseResolver;
use Org\Mxchange\CoreFramework\Resolver\Controller\ControllerResolver;
use Org\Mxchange\CoreFramework\Resolver\BaseResolver;
use Org\Mxchange\CoreFramework\Resolver\Controller\ControllerResolver;
@@
-18,11
+18,7
@@
use \InvalidArgumentException;
*
* @author Roland Haeder <webmaster@shipsimu.org>
* @version 0.0.0
*
* @author Roland Haeder <webmaster@shipsimu.org>
* @version 0.0.0
-<<<<<<< HEAD:framework/main/classes/resolver/controller/class_BaseControllerResolver.php
* @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
* @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
-=======
- * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
->>>>>>> Some updates::inc/main/classes/resolver/controller/class_BaseControllerResolver.php
* @license GNU GPL 3.0 or any newer version
* @link http://www.shipsimu.org
*
* @license GNU GPL 3.0 or any newer version
* @link http://www.shipsimu.org
*