X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fregistration%2Fclass_BaseRegistration.php;h=ffe0542d63e6b5d4f86cfe5ab683165f59bf8ccd;hb=2218902056efcf9a2c66fe7c24995e066bd7cd11;hp=9f6affe26101f329f4f910aa426d36698bacff14;hpb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;p=core.git

diff --git a/framework/main/classes/registration/class_BaseRegistration.php b/framework/main/classes/registration/class_BaseRegistration.php
index 9f6affe2..ffe0542d 100644
--- a/framework/main/classes/registration/class_BaseRegistration.php
+++ b/framework/main/classes/registration/class_BaseRegistration.php
@@ -4,7 +4,7 @@ namespace Org\Mxchange\CoreFramework\Registration;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
 use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
 
@@ -13,11 +13,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
-<<<<<<< HEAD:framework/main/classes/registration/class_BaseRegistration.php
- * @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/registration/class_BaseRegistration.php
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2020 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *
@@ -51,7 +47,7 @@ abstract class BaseRegistration extends BaseFrameworkSystem {
 	 * @param	$className	Name of the class
 	 * @return	void
 	 */
-	protected function __construct ($className) {
+	protected function __construct (string $className) {
 		// Call parent constructor
 		parent::__construct($className);
 	}