X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Ffactories%2Fregistry%2Fclass_SocketRegistryFactory.php;h=150acfaa7c4925cbef8a21f39c19ae5ef07691e9;hp=ed1442f0af5cd0dd650aea4f7f245bacdbfbe346;hb=b002c5909aa0f781505dde5414964b0f014cde01;hpb=6a1f98717d2fdf0723c2852f99d15688755aac13

diff --git a/framework/main/classes/factories/registry/class_SocketRegistryFactory.php b/framework/main/classes/factories/registry/class_SocketRegistryFactory.php
index ed1442f0..150acfaa 100644
--- a/framework/main/classes/factories/registry/class_SocketRegistryFactory.php
+++ b/framework/main/classes/factories/registry/class_SocketRegistryFactory.php
@@ -4,18 +4,14 @@ namespace Org\Mxchange\CoreFramework\Factory\Registry\Socket;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
 /**
  * A factory class for socket registries
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
-<<<<<<< HEAD:framework/main/classes/factories/registry/class_SocketRegistryFactory.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/factories/registry/class_SocketRegistryFactory.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *
@@ -52,7 +48,7 @@ class SocketRegistryFactory extends ObjectFactory {
 	 */
 	public static final function createSocketRegistryInstance () {
 		// Get registry instance
-		$registryInstance = Registry::getRegistry();
+		$registryInstance = GenericRegistry::getRegistry();
 
 		// Do we have an instance in the registry?
 		if ($registryInstance->instanceExists('socket_registry')) {