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

[core.git] / framework / main / classes / stacker / file / fifo / class_FiFoFileStack.php

diff --git a/framework/main/classes/stacker/file/fifo/class_FiFoFileStack.php b/framework/main/classes/stacker/file/fifo/class_FiFoFileStack.php
index d44ba9f6dd2c7c32fc1daa616628ef87c0080d16..9994e38cb3ed071f05f68af972d75c9c3051c73d 100644 (file)
--- a/framework/main/classes/stacker/file/fifo/class_FiFoFileStack.php
+++ b/framework/main/classes/stacker/file/fifo/class_FiFoFileStack.php
@@ -16,11 +16,7 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/stacker/file/fifo/class_FiFoFileStack.php
  * @copyright  Copyright (c) 2017 Core Developer Team
-=======
- * @copyright  Copyright (c) 2016 Core Developer Team
->>>>>>> Some updates::inc/main/classes/stacker/file/fifo/class_FiFoFileStack.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *