X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Ffactories%2Fclass_BaseFactory.php;h=d5d4b79d67bc2359be6d10cd0ec03ca4e585e089;hp=fd76f21cf7fe454df986a19280b18b819aecbfb7;hb=f57dd51863ec9baacba447d76b46d5c709b9b02e;hpb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0

diff --git a/framework/main/classes/factories/class_BaseFactory.php b/framework/main/classes/factories/class_BaseFactory.php
index fd76f21c..d5d4b79d 100644
--- a/framework/main/classes/factories/class_BaseFactory.php
+++ b/framework/main/classes/factories/class_BaseFactory.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/factories/class_BaseFactory.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/factories/class_BaseFactory.php
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2019 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *