Some updates:

[core.git] / framework / main / exceptions / config / class_NoConfigEntryException.php

diff --git a/framework/main/exceptions/config/class_NoConfigEntryException.php b/framework/main/exceptions/config/class_NoConfigEntryException.php
index 5c24a5b882938ba7134b290986591db1d40b7a2d..a662fc5d30a2708c24bf069a4f52283e93838c67 100644 (file)
--- a/framework/main/exceptions/config/class_NoConfigEntryException.php
+++ b/framework/main/exceptions/config/class_NoConfigEntryException.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/config/class_NoConfigEntryException.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/config/class_NoConfigEntryException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               Rename this class to NoFoundEntryException