X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=framework%2Fmain%2Finterfaces%2Fio%2Ffile%2Fcsv%2Fclass_CsvInputStreamer.php;h=3de7eacd6c2548fe69dd5a3155207df0876049a1;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hp=5cd509e0d39b20edb9fb50fa236993f127604059;hpb=78a010fef84895720e796842208f01dfb619c332;p=core.git

diff --git a/framework/main/interfaces/io/file/csv/class_CsvInputStreamer.php b/framework/main/interfaces/io/file/csv/class_CsvInputStreamer.php
index 5cd509e0..3de7eacd 100644
--- a/framework/main/interfaces/io/file/csv/class_CsvInputStreamer.php
+++ b/framework/main/interfaces/io/file/csv/class_CsvInputStreamer.php
@@ -1,16 +1,20 @@
 <?php
 // Own namespace
-namespace CoreFramework\Stream\Filesystem;
+namespace Org\Mxchange\CoreFramework\Stream\Filesystem;
 
 // Import framework stuff
-use CoreFramework\Stream\Filesystem\FileInputStreamer;
+use Org\Mxchange\CoreFramework\Stream\Filesystem\FileInputStreamer;
 
 /**
  * An interface for CSV file input operations.
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
+<<<<<<< HEAD:framework/main/interfaces/io/file/csv/class_CsvInputStreamer.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/io/file/csv/class_CsvInputStreamer.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *