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

[core.git] / framework / main / exceptions / database / local_file / class_SavePathReadProtectedException.php

diff --git a/framework/main/exceptions/database/local_file/class_SavePathReadProtectedException.php b/framework/main/exceptions/database/local_file/class_SavePathReadProtectedException.php
index 2509edba0eeb26cc46523bd4754ce9df1d15e961..9bb346056d751013c48740c5dfd3c17527fbcbc4 100644 (file)
--- a/framework/main/exceptions/database/local_file/class_SavePathReadProtectedException.php
+++ b/framework/main/exceptions/database/local_file/class_SavePathReadProtectedException.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/local_file/class_SavePathReadProtectedException.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/local_file/class_SavePathReadProtectedException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Please don't use this