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

[core.git] / framework / main / exceptions / database / class_DatabaseException.php

diff --git a/framework/main/exceptions/database/class_DatabaseException.php b/framework/main/exceptions/database/class_DatabaseException.php
index 3a493b03b8f9d41436364fbc20880d5f1ba3cb55..ba71bd17f8c0235983b67cff478324e4e2eee27a 100644 (file)
--- a/framework/main/exceptions/database/class_DatabaseException.php
+++ b/framework/main/exceptions/database/class_DatabaseException.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/database/class_DatabaseException.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/database/class_DatabaseException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *