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

[core.git] / framework / main / classes / stacker / filo / class_FiLoStacker.php

diff --git a/framework/main/classes/stacker/filo/class_FiLoStacker.php b/framework/main/classes/stacker/filo/class_FiLoStacker.php
index 43e84b84459b6365f7bf54f5716007ed5ca6021f..61caf361c131e32b8eb3b1d8902ab22b07bd3e8a 100644 (file)
--- a/framework/main/classes/stacker/filo/class_FiLoStacker.php
+++ b/framework/main/classes/stacker/filo/class_FiLoStacker.php
@@ -7,11 +7,7 @@ namespace Org\Mxchange\CoreFramework\Stacker;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/stacker/filo/class_FiLoStacker.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/stacker/filo/class_FiLoStacker.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *