X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Finterfaces%2Findex%2Fstack%2Fclass_IndexableStack.php;h=b6051190b317949cfa8c1cad8058f652ab6ce12f;hp=6fa47bc3a5c64896d4280fa05e2f8abc39ea26e8;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hpb=1daff5a94de037022058d8760a06bd869de67630

diff --git a/framework/main/interfaces/index/stack/class_IndexableStack.php b/framework/main/interfaces/index/stack/class_IndexableStack.php
index 6fa47bc3..b6051190 100644
--- a/framework/main/interfaces/index/stack/class_IndexableStack.php
+++ b/framework/main/interfaces/index/stack/class_IndexableStack.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Index\Indexable;
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
+<<<<<<< HEAD:framework/main/interfaces/index/stack/class_IndexableStack.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/interfaces/index/stack/class_IndexableStack.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *