Some updates:

[core.git] / framework / main / classes / container / class_

diff --git a/framework/main/classes/container/class_ b/framework/main/classes/container/class_
index c3bf332e7f00ba27551e4f14b59633d68cd264f0..82fd673852a65de7a55971a85104217e7a765c9c 100644 (file)
--- a/framework/main/classes/container/class_
+++ b/framework/main/classes/container/class_
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Registry\Registerable;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0

+<<<<<<< HEAD:framework/main/classes/container/class_

  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @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/container/class_

  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *