Some updates:

[core.git] / framework / main / classes / discovery / payment / class_LocalPaymentDiscovery.php

diff --git a/framework/main/classes/discovery/payment/class_LocalPaymentDiscovery.php b/framework/main/classes/discovery/payment/class_LocalPaymentDiscovery.php
index f499e7c0efc94566ae6fbe3d556d9c4458fd89bb..8e314580ebf11b8d006c2384feb5455e38cd8b7e 100644 (file)
--- a/framework/main/classes/discovery/payment/class_LocalPaymentDiscovery.php
+++ b/framework/main/classes/discovery/payment/class_LocalPaymentDiscovery.php
@@ -1,16 +1,16 @@
 <?php
 // Own namespace
-namespace CoreFramework\Discovery\Payment;
+namespace Org\Mxchange\CoreFramework\Discovery\Payment;
 
 // Import framework stuff
-use CoreFramework\Discovery\BaseDiscovery;
-use CoreFramework\Discovery\Discoverable;
-use CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory;
-use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Filter\Filterable;
-use CoreFramework\Helper\Template\HelpableTemplate;
-use CoreFramework\Registry\Registerable;
-use CoreFramework\Request\Requestable;
+use Org\Mxchange\CoreFramework\Discovery\BaseDiscovery;
+use Org\Mxchange\CoreFramework\Discovery\Discoverable;
+use Org\Mxchange\CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory;
+use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Filter\Filterable;
+use Org\Mxchange\CoreFramework\Helper\Template\HelpableTemplate;
+use Org\Mxchange\CoreFramework\Registry\Registerable;
+use Org\Mxchange\CoreFramework\Request\Requestable;
 
 /**
  * A local payment discovery class. This class looks in local database for
@@ -19,7 +19,11 @@ use CoreFramework\Request\Requestable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/discovery/payment/class_LocalPaymentDiscovery.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/discovery/payment/class_LocalPaymentDiscovery.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *