Some updates:

[core.git] / framework / main / interfaces / streams / output / class_OutputStream.php

diff --git a/framework/main/interfaces/streams/output/class_OutputStream.php b/framework/main/interfaces/streams/output/class_OutputStream.php
index f27fe3b8ab6053c6ba923f8d2e0757fd1e94f595..dd841f45ce1f64c6301c3c36cc98ad0aa6fdeda5 100644 (file)
--- a/framework/main/interfaces/streams/output/class_OutputStream.php
+++ b/framework/main/interfaces/streams/output/class_OutputStream.php
@@ -1,16 +1,20 @@
 <?php
 // Own namespace
-namespace CoreFramework\Stream\Output;
+namespace Org\Mxchange\CoreFramework\Stream\Output;
 
 // Import framework stuff
-use CoreFramework\Stream\Stream;
+use Org\Mxchange\CoreFramework\Stream\Stream;
 
 /**
  * An OutputStream interface
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/streams/output/class_OutputStream.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/interfaces/streams/output/class_OutputStream.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *