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

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

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