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

[core.git] / framework / main / classes / file_directories / directory / class_FrameworkDirectoryPointer.php

diff --git a/framework/main/classes/file_directories/directory/class_FrameworkDirectoryPointer.php b/framework/main/classes/file_directories/directory/class_FrameworkDirectoryPointer.php
index 9695a7ab7e7767ca86924aaf091e4f8a426247c4..4c033024fac389928d9ee40f961e22d9e21ca572 100644 (file)
--- a/framework/main/classes/file_directories/directory/class_FrameworkDirectoryPointer.php
+++ b/framework/main/classes/file_directories/directory/class_FrameworkDirectoryPointer.php
@@ -15,11 +15,7 @@ use \DirectoryIterator;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/file_directories/directory/class_FrameworkDirectoryPointer.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/directory/class_FrameworkDirectoryPointer.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *