X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Ffactories%2Fregistry%2Fclass_SocketRegistryFactory.php;fp=framework%2Fmain%2Fclasses%2Ffactories%2Fregistry%2Fclass_SocketRegistryFactory.php;h=ed1442f0af5cd0dd650aea4f7f245bacdbfbe346;hp=14c4eab2c5d3e4c699690d00dca0abcd075e649a;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hpb=1daff5a94de037022058d8760a06bd869de67630

diff --git a/framework/main/classes/factories/registry/class_SocketRegistryFactory.php b/framework/main/classes/factories/registry/class_SocketRegistryFactory.php
index 14c4eab2..ed1442f0 100644
--- a/framework/main/classes/factories/registry/class_SocketRegistryFactory.php
+++ b/framework/main/classes/factories/registry/class_SocketRegistryFactory.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Registry\Registry;
  *
  * @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
  *