X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Finterfaces%2Fio%2Fclass_FilePointer.php;h=124a8b069a29bcaac10167486ab737024251b65f;hb=384eb9724a031ed971f4f2aaf3cf691dbfc1690d;hp=29e579f1f7caaa9abafb96b299370ed70ddb6176;hpb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;p=core.git

diff --git a/framework/main/interfaces/io/class_FilePointer.php b/framework/main/interfaces/io/class_FilePointer.php
index 29e579f1..124a8b06 100644
--- a/framework/main/interfaces/io/class_FilePointer.php
+++ b/framework/main/interfaces/io/class_FilePointer.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
-<<<<<<< HEAD:framework/main/interfaces/io/class_FilePointer.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/class_FilePointer.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *