X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fexceptions%2Fdatabase%2Flocal_file%2Fclass_SavePathReadProtectedException.php;h=69dbbd1bb1d217c037ad0b8b26573dc5cfbaf1a6;hb=e1220edf0b09e635b818aba6465f2b7d47e7d310;hp=2509edba0eeb26cc46523bd4754ce9df1d15e961;hpb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;p=core.git

diff --git a/framework/main/exceptions/database/local_file/class_SavePathReadProtectedException.php b/framework/main/exceptions/database/local_file/class_SavePathReadProtectedException.php
index 2509edba..69dbbd1b 100644
--- 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
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2020 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  * @deprecated	Please don't use this