Some updates:

[core.git] / framework / main / interfaces / registration / class_UserRegister.php

diff --git a/framework/main/interfaces/registration/class_UserRegister.php b/framework/main/interfaces/registration/class_UserRegister.php
index 9503525e7c357aaa9931db6a005ad9fea7d6aa05..eda82f6e1b1cad36e256cf4f6727366271b19a8c 100644 (file)
--- a/framework/main/interfaces/registration/class_UserRegister.php
+++ b/framework/main/interfaces/registration/class_UserRegister.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Criteria\Add\AddableCriteria;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/registration/class_UserRegister.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/interfaces/registration/class_UserRegister.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *