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

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

diff --git a/framework/main/interfaces/io/file/handler/class_IoHandler.php b/framework/main/interfaces/io/file/handler/class_IoHandler.php
index 8d095b86d2e68d692da7a16cfb2c9840b67ebfb1..b8a5293efbc7fcbf9a5b5f8e1cef862d4309379d 100644 (file)
--- a/framework/main/interfaces/io/file/handler/class_IoHandler.php
+++ b/framework/main/interfaces/io/file/handler/class_IoHandler.php
@@ -15,11 +15,7 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/io/file/handler/class_IoHandler.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/handler/class_IoHandler.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -37,7 +33,6 @@ use \SplFileInfo;
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 interface IoHandler extends FileInputStreamer, FileOutputStreamer {
-
        /**
         * Setter for the *real* file input instance
         *