Renamed Registry -> GenericRegistry to make it clear that this registry does

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

diff --git a/framework/main/exceptions/config/class_ConfigValueTypeUnsupportedException.php b/framework/main/exceptions/config/class_ConfigValueTypeUnsupportedException.php
index 6ac3ecc708bf130331e046f24a68114928a0273d..d4b5002a9ec56ac34b4cfe4cdfff172aea58b778 100644 (file)
--- a/framework/main/exceptions/config/class_ConfigValueTypeUnsupportedException.php
+++ b/framework/main/exceptions/config/class_ConfigValueTypeUnsupportedException.php
@@ -12,11 +12,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/config/class_ConfigValueTypeUnsupportedException.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_ConfigValueTypeUnsupportedException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  * @todo               These are invalid argument exceptions