Some updates:

[core.git] / framework / main / classes / filter / change / class_EmailChangeFilter.php

diff --git a/framework/main/classes/filter/change/class_EmailChangeFilter.php b/framework/main/classes/filter/change/class_EmailChangeFilter.php
index 632607d8ee528145b94bb38fee30e4fe37bdc866..e7c3be06a997b3c8aadb2e012812adaf25baadc4 100644 (file)
--- a/framework/main/classes/filter/change/class_EmailChangeFilter.php
+++ b/framework/main/classes/filter/change/class_EmailChangeFilter.php
@@ -1,20 +1,24 @@
 <?php
 // Own namespace
-namespace CoreFramework\Filter\Change\Email;
+namespace Org\Mxchange\CoreFramework\Filter\Change\Email;
 
 // Import framework stuff
-use CoreFramework\Filter\BaseFilter;
-use CoreFramework\Filter\Filterable;
-use CoreFramework\Registry\Registry;
-use CoreFramework\Request\Requestable;
-use CoreFramework\Response\Responseable;
+use Org\Mxchange\CoreFramework\Filter\BaseFilter;
+use Org\Mxchange\CoreFramework\Filter\Filterable;
+use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Request\Requestable;
+use Org\Mxchange\CoreFramework\Response\Responseable;
 
 /**
  * A filter for detecting email changes
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/filter/change/class_EmailChangeFilter.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/change/class_EmailChangeFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *