Some updates:

[core.git] / framework / main / classes / factories / user / class_UserFactory.php

diff --git a/framework/main/classes/factories/user/class_UserFactory.php b/framework/main/classes/factories/user/class_UserFactory.php
index 19ef3d955063a169958a32e98a755d1c0fde0f15..2a84ea283821196c934c64d4d55caec186b748c8 100644 (file)
--- a/framework/main/classes/factories/user/class_UserFactory.php
+++ b/framework/main/classes/factories/user/class_UserFactory.php
@@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\Request\Requestable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/factories/user/class_UserFactory.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/user/class_UserFactory.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *