Some updates:

[core.git] / framework / main / classes / registry / class_BaseRegistry.php

diff --git a/framework/main/classes/registry/class_BaseRegistry.php b/framework/main/classes/registry/class_BaseRegistry.php
index 871975af6ab3e2645dd18b18a51cd51f91212ee0..cf406493b1d11b628a71ab9122b8f9ce890a1b52 100644 (file)
--- a/framework/main/classes/registry/class_BaseRegistry.php
+++ b/framework/main/classes/registry/class_BaseRegistry.php
@@ -15,7 +15,11 @@ use \IteratorAggregate;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/registry/class_BaseRegistry.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/class_BaseRegistry.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *