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

[core.git] / framework / main / exceptions / result / class_InvalidDatabaseResultException.php

diff --git a/framework/main/exceptions/result/class_InvalidDatabaseResultException.php b/framework/main/exceptions/result/class_InvalidDatabaseResultException.php
index fccf81994b543f62160c904ddf4796edd1066fa4..3901ef8fed18bf74a274c70105da5e4f2abb8563 100644 (file)
--- a/framework/main/exceptions/result/class_InvalidDatabaseResultException.php
+++ b/framework/main/exceptions/result/class_InvalidDatabaseResultException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0

-<<<<<<< HEAD:framework/main/exceptions/result/class_InvalidDatabaseResultException.php

  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @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/result/class_InvalidDatabaseResultException.php

  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *