Some updates:

[core.git] / framework / main / classes / registry / sub / class_SubRegistry.php

diff --git a/framework/main/classes/registry/sub/class_SubRegistry.php b/framework/main/classes/registry/sub/class_SubRegistry.php
index 1df76b280cb881b588d57e53758724cc915f5164..e7725baa4f2b113d586ebe40ad196720a2d61446 100644 (file)
--- a/framework/main/classes/registry/sub/class_SubRegistry.php
+++ b/framework/main/classes/registry/sub/class_SubRegistry.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Registry\Register;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/registry/sub/class_SubRegistry.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/sub/class_SubRegistry.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *