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

[core.git] / framework / main / exceptions / main / class_FatalErrorException.php

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