Some updates:

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

diff --git a/framework/main/exceptions/database/local_file/class_SavePathWriteProtectedException.php b/framework/main/exceptions/database/local_file/class_SavePathWriteProtectedException.php
index 439b33529f98477e567f6e847e45eb85d8635548..ad5e55f515a0ba76d7382a5484bfbf5f6fcf7ac8 100644 (file)
--- a/framework/main/exceptions/database/local_file/class_SavePathWriteProtectedException.php
+++ b/framework/main/exceptions/database/local_file/class_SavePathWriteProtectedException.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Database\DatabaseException;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/database/local_file/class_SavePathWriteProtectedException.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_SavePathWriteProtectedException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @deprecated Please don't use this