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

[core.git] / framework / main / interfaces / iterator / file / class_SeekableWritableFileIterator.php

diff --git a/framework/main/interfaces/iterator/file/class_SeekableWritableFileIterator.php b/framework/main/interfaces/iterator/file/class_SeekableWritableFileIterator.php
index ad24331ee319f4e19b2a1b28a40f8bf33ad68e69..d134ff3678255d6bf00fb2cd8151842517b50ad1 100644 (file)
--- a/framework/main/interfaces/iterator/file/class_SeekableWritableFileIterator.php
+++ b/framework/main/interfaces/iterator/file/class_SeekableWritableFileIterator.php
@@ -11,11 +11,7 @@ use \SeekableIterator;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/iterator/file/class_SeekableWritableFileIterator.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/iterator/class_SeekableWritableFileIterator.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *