X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Finterfaces%2Fio%2Ffile%2Fclass_FileInputStreamer.php;h=c4c75a5b31d598c71e4fe8cb07d05f684b39a415;hp=bd5247d89f08b52cb76b98ebe7504292e666905c;hb=b002c5909aa0f781505dde5414964b0f014cde01;hpb=6a1f98717d2fdf0723c2852f99d15688755aac13

diff --git a/framework/main/interfaces/io/file/class_FileInputStreamer.php b/framework/main/interfaces/io/file/class_FileInputStreamer.php
index bd5247d8..c4c75a5b 100644
--- 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
 	 *