Renamed Registry -> GenericRegistry to make it clear that this registry does

[core.git] / framework / main / interfaces / io / file / class_FileInputStreamer.php

diff --git a/framework/main/interfaces/io/file/class_FileInputStreamer.php b/framework/main/interfaces/io/file/class_FileInputStreamer.php
index bd5247d89f08b52cb76b98ebe7504292e666905c..c4c75a5b31d598c71e4fe8cb07d05f684b39a415 100644 (file)
--- a/framework/main/interfaces/io/file/class_FileInputStreamer.php
+++ b/framework/main/interfaces/io/file/class_FileInputStreamer.php
@@ -13,11 +13,7 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/io/file/class_FileInputStreamer.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/class_FileInputStreamer.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -35,7 +31,6 @@ use \SplFileInfo;
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 interface FileInputStreamer extends StreamableInput {
-
        /**
         * Reads from a local or remote file
         *