Some updates:

[core.git] / framework / main / classes / factories / index / class_FileStackIndexFactory.php

diff --git a/framework/main/classes/factories/index/class_FileStackIndexFactory.php b/framework/main/classes/factories/index/class_FileStackIndexFactory.php
index 8d366c0e2e5bb804e53b85df13b84e63a1b9739e..0f7ffa3e999c8f79f2fbca4b00223f951f0ea942 100644 (file)
--- a/framework/main/classes/factories/index/class_FileStackIndexFactory.php
+++ b/framework/main/classes/factories/index/class_FileStackIndexFactory.php
@@ -15,7 +15,11 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/factories/index/class_FileStackIndexFactory.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/factories/index/class_FileStackIndexFactory.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *