Some updates:

[core.git] / framework / main / classes / decorator / xml / class_XmlCompactorDecorator.php

diff --git a/framework/main/classes/decorator/xml/class_XmlCompactorDecorator.php b/framework/main/classes/decorator/xml/class_XmlCompactorDecorator.php
index 3bd84ad3c56e0d465eaeb665ea0d901e2a92ee17..f5b4a407c18470e9e286429de6c263ee0841d270 100644 (file)
--- a/framework/main/classes/decorator/xml/class_XmlCompactorDecorator.php
+++ b/framework/main/classes/decorator/xml/class_XmlCompactorDecorator.php
@@ -1,18 +1,22 @@
 <?php
 // Own namespace
-namespace CoreFramework\Parser\Xml;
+namespace Org\Mxchange\CoreFramework\Parser\Xml;
 
 // Import framework stuff
-use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Generic\BaseDecorator;
-use CoreFramework\Parser\Parseable;
+use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Generic\BaseDecorator;
+use Org\Mxchange\CoreFramework\Parser\Parseable;
 
 /**
  * A XML compacting decorator class for XML parsers
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/decorator/xml/class_XmlCompactorDecorator.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/decorator/xml/class_XmlCompactorDecorator.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *