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

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

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