Some updates:

[core.git] / framework / main / classes / filter / update / class_UserUpdateFilter.php

diff --git a/framework/main/classes/filter/update/class_UserUpdateFilter.php b/framework/main/classes/filter/update/class_UserUpdateFilter.php
index a6163692f7ee8d02381d4229c35bda127853aedc..c49bddfbf4a6220ff6ac7c4e3d01d70b79d3433b 100644 (file)
--- a/framework/main/classes/filter/update/class_UserUpdateFilter.php
+++ b/framework/main/classes/filter/update/class_UserUpdateFilter.php
@@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/filter/update/class_UserUpdateFilter.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/filter/update/class_UserUpdateFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *