X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Finterfaces%2Fblock%2Fcalculatable%2Fclass_CalculatableBlock.php;h=b6f076aeb6d7451463af797a33f35a78fb6014ab;hp=5820c38d13407bf05b131ce73045b7b3b4328b01;hb=b002c5909aa0f781505dde5414964b0f014cde01;hpb=6a1f98717d2fdf0723c2852f99d15688755aac13

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