X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Ffilter%2Fupdate%2Fclass_UserStatusConfimedUpdateFilter.php;fp=framework%2Fmain%2Fclasses%2Ffilter%2Fupdate%2Fclass_UserStatusConfimedUpdateFilter.php;h=13e82f16514f79d1c04682d4c3aa8d24d47c141c;hp=dd5c4c79df8cb539794be74fa6921a0d105d3ac3;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hpb=1daff5a94de037022058d8760a06bd869de67630

diff --git a/framework/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php b/framework/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php
index dd5c4c79..13e82f16 100644
--- a/framework/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php
+++ b/framework/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.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_UserStatusConfimedUpdateFilter.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_UserStatusConfimedUpdateFilter.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *