X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=framework%2Fmain%2Fclasses%2Ffactories%2Findex%2Fclass_FileStackIndexFactory.php;h=0f7ffa3e999c8f79f2fbca4b00223f951f0ea942;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hp=8d366c0e2e5bb804e53b85df13b84e63a1b9739e;hpb=4f9cf34b521892cb99fae9b21b92787f3d555b74;p=core.git

diff --git a/framework/main/classes/factories/index/class_FileStackIndexFactory.php b/framework/main/classes/factories/index/class_FileStackIndexFactory.php
index 8d366c0e..0f7ffa3e 100644
--- 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
  *