X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Ffile_directories%2Fclass_BaseFileIo.php;h=ce65bd898a9b8f087af82ffdd4ad13f3fa580295;hp=72a6a1651b821e383ac251767d5dec8a56ac2a71;hb=b002c5909aa0f781505dde5414964b0f014cde01;hpb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0

diff --git a/framework/main/classes/file_directories/class_BaseFileIo.php b/framework/main/classes/file_directories/class_BaseFileIo.php
index 72a6a165..ce65bd89 100644
--- a/framework/main/classes/file_directories/class_BaseFileIo.php
+++ b/framework/main/classes/file_directories/class_BaseFileIo.php
@@ -16,11 +16,7 @@ use \SplFileObject;
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
-<<<<<<< HEAD:framework/main/classes/file_directories/class_BaseFileIo.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/classes/file_directories/class_BaseFileIo.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *