Some updates:

[core.git] / framework / main / exceptions / file_directory / class_FileReadProtectedException.php

diff --git a/framework/main/exceptions/file_directory/class_FileReadProtectedException.php b/framework/main/exceptions/file_directory/class_FileReadProtectedException.php
index d791c3ed71e41671d5e54906445975d7cb7f33b6..b1634fb8647855fb1b7dae3b00443abab01beaa1 100644 (file)
--- a/framework/main/exceptions/file_directory/class_FileReadProtectedException.php
+++ b/framework/main/exceptions/file_directory/class_FileReadProtectedException.php
@@ -13,7 +13,11 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/file_directory/class_FileReadProtectedException.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/file_directory/class_FileReadProtectedException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *