X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fregistry%2Fgeneric%2Fclass_Registry.php;h=ca9ec0999fae8813e56e48aacde4300dd0150795;hp=476628e91d436bfb9c1ebd93131dfd725f0c8dcf;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hpb=1daff5a94de037022058d8760a06bd869de67630

diff --git a/framework/main/classes/registry/generic/class_Registry.php b/framework/main/classes/registry/generic/class_Registry.php
index 476628e9..ca9ec099 100644
--- a/framework/main/classes/registry/generic/class_Registry.php
+++ b/framework/main/classes/registry/generic/class_Registry.php
@@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Registry\Register;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
+<<<<<<< HEAD:framework/main/classes/registry/generic/class_Registry.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/registry/generic/class_Registry.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *