X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fcontainer%2Fclass_BaseContainer.php;h=b55c5b4d752a8ca85d84283f850a8c43b3f16c74;hp=4b9da3829c31dcec3fabd1043e1674a526ceb041;hb=b002c5909aa0f781505dde5414964b0f014cde01;hpb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0

diff --git a/framework/main/classes/container/class_BaseContainer.php b/framework/main/classes/container/class_BaseContainer.php
index 4b9da382..b55c5b4d 100644
--- a/framework/main/classes/container/class_BaseContainer.php
+++ b/framework/main/classes/container/class_BaseContainer.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
-<<<<<<< HEAD:framework/main/classes/container/class_BaseContainer.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/container/class_BaseContainer.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *