Some updates:

[core.git] / framework / main / exceptions / stacker / class_FullStackerException.php

diff --git a/framework/main/exceptions/stacker/class_FullStackerException.php b/framework/main/exceptions/stacker/class_FullStackerException.php
index 1388995b92a8647f47d2b9d34864e953180bba41..00447302c8d3c9cd4e48ec18fb003cdb0d7e2951 100644 (file)
--- a/framework/main/exceptions/stacker/class_FullStackerException.php
+++ b/framework/main/exceptions/stacker/class_FullStackerException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/stacker/class_FullStackerException.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/exceptions/stacker/class_FullStackerException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *