Some updates:

[core.git] / framework / main / interfaces / block / calculatable / class_CalculatableBlock.php

diff --git a/framework/main/interfaces/block/calculatable/class_CalculatableBlock.php b/framework/main/interfaces/block/calculatable/class_CalculatableBlock.php
index b6f076aeb6d7451463af797a33f35a78fb6014ab..5820c38d13407bf05b131ce73045b7b3b4328b01 100644 (file)
--- a/framework/main/interfaces/block/calculatable/class_CalculatableBlock.php
+++ b/framework/main/interfaces/block/calculatable/class_CalculatableBlock.php
@@ -10,7 +10,11 @@ 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
  *