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

[core.git] / framework / main / exceptions / database / general / class_SqlException.php

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