X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Ffactories%2Fobjects%2Fclass_ObjectFactory.php;h=f06a70a16b6a82a4ff32738853114b89ffdbb4b9;hb=8d8cf621bd811811cecd83c65a4ab91f27258e79;hp=5467f403fa62c616ae68bcf206d803e9abeb0f97;hpb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;p=core.git

diff --git a/framework/main/classes/factories/objects/class_ObjectFactory.php b/framework/main/classes/factories/objects/class_ObjectFactory.php
index 5467f403..f06a70a1 100644
--- a/framework/main/classes/factories/objects/class_ObjectFactory.php
+++ b/framework/main/classes/factories/objects/class_ObjectFactory.php
@@ -14,11 +14,7 @@ use \InvalidArgumentException;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
-<<<<<<< HEAD:framework/main/classes/factories/objects/class_ObjectFactory.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/objects/class_ObjectFactory.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *