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

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