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

[core.git] / framework / main / classes / iterator / file / class_FileIterator.php

diff --git a/framework/main/classes/iterator/file/class_FileIterator.php b/framework/main/classes/iterator/file/class_FileIterator.php
index ba9fd2c8b45271de45faf8280daf719923bc84bc..b4945aeec1dbc92110aba430fc892f027456a7b1 100644 (file)
--- a/framework/main/classes/iterator/file/class_FileIterator.php
+++ b/framework/main/classes/iterator/file/class_FileIterator.php
@@ -12,11 +12,7 @@ use Org\Mxchange\CoreFramework\Iterator\Filesystem\SeekableWritableFileIterator;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/iterator/file/class_FileIterator.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/iterator/file/class_FileIterator.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *