X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Findex%2Fclass_;h=4bda48c0dd07271df918864b14eb6631b6128685;hb=b002c5909aa0f781505dde5414964b0f014cde01;hp=1e9ca1649cd166b4d938b3a9fb91979c3038ef24;hpb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;p=core.git

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